Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235415
b: refs/heads/master
c: da13051
h: refs/heads/master
i:
  235413: aa9d7ad
  235411: 1ebacb6
  235407: acb4303
v: v3
  • Loading branch information
Sarah Sharp committed Mar 14, 2011
1 parent ee0cd3d commit e964249
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 47 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0b8ca72a23df365a413e03f991bc6b8179dee13f
refs/heads/master: da13051cc756756f10b2da8ea97b05bdf84bd7bb
4 changes: 2 additions & 2 deletions trunk/drivers/staging/usbip/vhci_hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ static inline void hub_descriptor(struct usb_hub_descriptor *desc)
desc->wHubCharacteristics = (__force __u16)
(__constant_cpu_to_le16(0x0001));
desc->bNbrPorts = VHCI_NPORTS;
desc->bitmap[0] = 0xff;
desc->bitmap[1] = 0xff;
desc->DeviceRemovable[0] = 0xff;
desc->DeviceRemovable[1] = 0xff;
}

static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/gadget/dummy_hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1593,8 +1593,8 @@ hub_descriptor (struct usb_hub_descriptor *desc)
desc->bDescLength = 9;
desc->wHubCharacteristics = cpu_to_le16(0x0001);
desc->bNbrPorts = 1;
desc->bitmap [0] = 0xff;
desc->bitmap [1] = 0xff;
desc->DeviceRemovable[0] = 0xff;
desc->DeviceRemovable[1] = 0xff;
}

static int dummy_hub_control (
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/ehci-hub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,8 @@ ehci_hub_descriptor (
desc->bDescLength = 7 + 2 * temp;

/* two bitmaps: ports removable, and usb 1.0 legacy PortPwrCtrlMask */
memset (&desc->bitmap [0], 0, temp);
memset (&desc->bitmap [temp], 0xff, temp);
memset(&desc->DeviceRemovable[0], 0, temp);
memset(&desc->DeviceRemovable[temp], 0xff, temp);

temp = 0x0008; /* per-port overcurrent reporting */
if (HCS_PPC (ehci->hcs_params))
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/imx21-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1472,8 +1472,8 @@ static int get_hub_descriptor(struct usb_hcd *hcd,
0x0010 | /* No over current protection */
0);

desc->bitmap[0] = 1 << 1;
desc->bitmap[1] = ~0;
desc->DeviceRemovable[0] = 1 << 1;
desc->DeviceRemovable[1] = ~0;
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/isp116x-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,9 +951,9 @@ static void isp116x_hub_descriptor(struct isp116x *isp116x,
/* Power switching, device type, overcurrent. */
desc->wHubCharacteristics = cpu_to_le16((u16) ((reg >> 8) & 0x1f));
desc->bPwrOn2PwrGood = (u8) ((reg >> 24) & 0xff);
/* two bitmaps: ports removable, and legacy PortPwrCtrlMask */
desc->bitmap[0] = 0;
desc->bitmap[1] = ~0;
/* ports removable, and legacy PortPwrCtrlMask */
desc->DeviceRemovable[0] = 0;
desc->DeviceRemovable[1] = ~0;
}

/* Perform reset of a given port.
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/isp1362-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1552,9 +1552,9 @@ static void isp1362_hub_descriptor(struct isp1362_hcd *isp1362_hcd,
desc->wHubCharacteristics = cpu_to_le16((reg >> 8) & 0x1f);
DBG(0, "%s: hubcharacteristics = %02x\n", __func__, cpu_to_le16((reg >> 8) & 0x1f));
desc->bPwrOn2PwrGood = (reg >> 24) & 0xff;
/* two bitmaps: ports removable, and legacy PortPwrCtrlMask */
desc->bitmap[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;
desc->bitmap[1] = ~0;
/* ports removable, and legacy PortPwrCtrlMask */
desc->DeviceRemovable[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;
desc->DeviceRemovable[1] = ~0;

DBG(3, "%s: exit\n", __func__);
}
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/isp1760-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1751,9 +1751,9 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
temp = 1 + (ports / 8);
desc->bDescLength = 7 + 2 * temp;

/* two bitmaps: ports removable, and usb 1.0 legacy PortPwrCtrlMask */
memset(&desc->bitmap[0], 0, temp);
memset(&desc->bitmap[temp], 0xff, temp);
/* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
memset(&desc->DeviceRemovable[0], 0, temp);
memset(&desc->DeviceRemovable[temp], 0xff, temp);

/* per-port overcurrent reporting */
temp = 0x0008;
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/usb/host/ohci-hub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,15 +580,15 @@ ohci_hub_descriptor (
temp |= 0x0008;
desc->wHubCharacteristics = (__force __u16)cpu_to_hc16(ohci, temp);

/* two bitmaps: ports removable, and usb 1.0 legacy PortPwrCtrlMask */
/* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
rh = roothub_b (ohci);
memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
desc->bitmap [0] = rh & RH_B_DR;
memset(desc->DeviceRemovable, 0xff, sizeof(desc->DeviceRemovable));
desc->DeviceRemovable[0] = rh & RH_B_DR;
if (ohci->num_ports > 7) {
desc->bitmap [1] = (rh & RH_B_DR) >> 8;
desc->bitmap [2] = 0xff;
desc->DeviceRemovable[1] = (rh & RH_B_DR) >> 8;
desc->DeviceRemovable[2] = 0xff;
} else
desc->bitmap [1] = 0xff;
desc->DeviceRemovable[1] = 0xff;
}

/*-------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/oxu210hp-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,9 @@ static void ehci_hub_descriptor(struct oxu_hcd *oxu,
temp = 1 + (ports / 8);
desc->bDescLength = 7 + 2 * temp;

/* two bitmaps: ports removable, and usb 1.0 legacy PortPwrCtrlMask */
memset(&desc->bitmap[0], 0, temp);
memset(&desc->bitmap[temp], 0xff, temp);
/* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
memset(&desc->DeviceRemovable[0], 0, temp);
memset(&desc->DeviceRemovable[temp], 0xff, temp);

temp = 0x0008; /* per-port overcurrent reporting */
if (HCS_PPC(oxu->hcs_params))
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/r8a66597-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2150,8 +2150,8 @@ static void r8a66597_hub_descriptor(struct r8a66597 *r8a66597,
desc->bDescLength = 9;
desc->bPwrOn2PwrGood = 0;
desc->wHubCharacteristics = cpu_to_le16(0x0011);
desc->bitmap[0] = ((1 << r8a66597->max_root_hub) - 1) << 1;
desc->bitmap[1] = ~0;
desc->DeviceRemovable[0] = ((1 << r8a66597->max_root_hub) - 1) << 1;
desc->DeviceRemovable[1] = ~0;
}

static int r8a66597_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/sl811-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1111,9 +1111,9 @@ sl811h_hub_descriptor (

desc->wHubCharacteristics = cpu_to_le16(temp);

/* two bitmaps: ports removable, and legacy PortPwrCtrlMask */
desc->bitmap[0] = 0 << 1;
desc->bitmap[1] = ~0;
/* ports removable, and legacy PortPwrCtrlMask */
desc->DeviceRemovable[0] = 0 << 1;
desc->DeviceRemovable[1] = ~0;
}

static void
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/usb/host/u132-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2604,13 +2604,13 @@ static int u132_roothub_descriptor(struct u132 *u132,
retval = u132_read_pcimem(u132, roothub.b, &rh_b);
if (retval)
return retval;
memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
desc->bitmap[0] = rh_b & RH_B_DR;
memset(desc->DeviceRemovable, 0xff, sizeof(desc->DeviceRemovable));
desc->DeviceRemovable[0] = rh_b & RH_B_DR;
if (u132->num_ports > 7) {
desc->bitmap[1] = (rh_b & RH_B_DR) >> 8;
desc->bitmap[2] = 0xff;
desc->DeviceRemovable[1] = (rh_b & RH_B_DR) >> 8;
desc->DeviceRemovable[2] = 0xff;
} else
desc->bitmap[1] = 0xff;
desc->DeviceRemovable[1] = 0xff;
return 0;
}

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/usb/host/xhci-hub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ static void xhci_hub_descriptor(struct xhci_hcd *xhci,
temp = 1 + (ports / 8);
desc->bDescLength = 7 + 2 * temp;

/* Why does core/hcd.h define bitmap? It's just confusing. */
memset(&desc->DeviceRemovable[0], 0, temp);
memset(&desc->DeviceRemovable[temp], 0xff, temp);

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/wusbcore/rh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ static int wusbhc_rh_get_hub_descr(struct wusbhc *wusbhc, u16 wValue,
descr->bPwrOn2PwrGood = 0;
descr->bHubContrCurrent = 0;
/* two bitmaps: ports removable, and usb 1.0 legacy PortPwrCtrlMask */
memset(&descr->bitmap[0], 0, temp);
memset(&descr->bitmap[temp], 0xff, temp);
memset(&descr->DeviceRemovable[0], 0, temp);
memset(&descr->DeviceRemovable[temp], 0xff, temp);
return 0;
}

Expand Down
7 changes: 0 additions & 7 deletions trunk/include/linux/usb/hcd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,6 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,

#endif /* CONFIG_USB_MON || CONFIG_USB_MON_MODULE */

/*-------------------------------------------------------------------------*/

/* hub.h ... DeviceRemovable in 2.4.2-ac11, gone in 2.4.10 */
/* bleech -- resurfaced in 2.4.11 or 2.4.12 */
#define bitmap DeviceRemovable


/*-------------------------------------------------------------------------*/

/* random stuff */
Expand Down

0 comments on commit e964249

Please sign in to comment.