Changeset d1e580a in mainline for uspace/drv/bus/usb/usbhid/usbhid.h

Timestamp:

2012-07-29T03:07:52Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

10334c2e

Parents:

d7c8e39f (diff), b2ba418 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/bus/usb/usbhid/usbhid.h (modified) (3 diffs)

uspace/drv/bus/usb/usbhid/usbhid.h

@@ -95 +95 @@
 };
 
-/*----------------------------------------------------------------------------*/
+
 /**
  * Structure for holding general HID device data.
@@ -132 +132 @@
 };
 
-/*----------------------------------------------------------------------------*/
+
 
 enum {
@@ -143 +143 @@
 extern const usb_endpoint_description_t *usb_hid_endpoints[];
 
-/*----------------------------------------------------------------------------*/
+
 
 int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev);