Changeset ba358ed in mainline

Timestamp:

2011-04-10T15:35:28Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

62bd8d3

Parents:

60c0573

Message:

Minor changes

• ifdef guards renamed

Location:

uspace/drv/usbhid

Files:

• generic/hiddev.h (modified) (2 diffs)
• kbd/conv.h (modified) (1 diff)
• kbd/kbddev.h (modified) (2 diffs)
• kbd/kbdrepeat.h (modified) (2 diffs)
• layout.h (modified) (1 diff)
• mouse/mousedev.h (modified) (2 diffs)
• usbhid.c (modified) (1 diff)
• usbhid.h (modified) (3 diffs)

uspace/drv/usbhid/generic/hiddev.h

@@ -34 +34 @@
  */
 
-#ifndef USB_HIDDDEV_H_
-#define USB_HIDDDEV_H_
+#ifndef USB_HID_HIDDDEV_H_
+#define USB_HID_HIDDDEV_H_
 
 #include <usb/devdrv.h>
@@ -49 +49 @@
     uint8_t *buffer, size_t buffer_size);
 
-#endif // USB_HIDDDEV_H_
+#endif // USB_HID_HIDDDEV_H_
 
 /**

uspace/drv/usbhid/kbd/conv.h

@@ -34 +34 @@
  */
 
-#ifndef USB_KBD_CONV_H_
-#define USB_KBD_CONV_H_
+#ifndef USB_HID_CONV_H_
+#define USB_HID_CONV_H_
 
 unsigned int usbhid_parse_scancode(int scancode);
 
-#endif /* USB_KBD_CONV_H_ */
+#endif /* USB_HID_CONV_H_ */
 
 /**

uspace/drv/usbhid/kbd/kbddev.h

@@ -34 +34 @@
  */
 
-#ifndef USB_KBDDEV_H_
-#define USB_KBDDEV_H_
+#ifndef USB_HID_KBDDEV_H_
+#define USB_HID_KBDDEV_H_
 
 #include <stdint.h>
@@ -133 +133 @@
 int usb_kbd_set_boot_protocol(struct usb_hid_dev *hid_dev);
 
-#endif /* USB_KBDDEV_H_ */
+#endif /* USB_HID_KBDDEV_H_ */
 
 /**

uspace/drv/usbhid/kbd/kbdrepeat.h

@@ -34 +34 @@
  */
 
-#ifndef USB_KBDREPEAT_H_
-#define USB_KBDREPEAT_H_
+#ifndef USB_HID_KBDREPEAT_H_
+#define USB_HID_KBDREPEAT_H_
 
 struct usb_kbd_t;
@@ -62 +62 @@
 void usb_kbd_repeat_stop(struct usb_kbd_t *kbd, unsigned int key);
 
-#endif /* USB_KBDREPEAT_H_ */
+#endif /* USB_HID_KBDREPEAT_H_ */
 
 /**

uspace/drv/usbhid/layout.h

@@ -36 +36 @@
  */
 
-#ifndef USB_KBD_LAYOUT_H_
-#define USB_KBD_LAYOUT_H_
+#ifndef USB_HID_LAYOUT_H_
+#define USB_HID_LAYOUT_H_
 
 #include <sys/types.h>

uspace/drv/usbhid/mouse/mousedev.h

@@ -34 +34 @@
  */
 
-#ifndef USB_MOUSEDEV_H_
-#define USB_MOUSEDEV_H_
+#ifndef USB_HID_MOUSEDEV_H_
+#define USB_HID_MOUSEDEV_H_
 
 #include <usb/devdrv.h>
@@ -71 +71 @@
 /*----------------------------------------------------------------------------*/
 
-#endif // USB_MOUSEDEV_H_
+#endif // USB_HID_MOUSEDEV_H_
 
 /**

uspace/drv/usbhid/usbhid.c

@@ -51 +51 @@
 /*----------------------------------------------------------------------------*/
 
-typedef struct usb_hid_callback_mapping {
-        usb_hid_report_path_t *path;
-        char *vendor_id;
-        char *product_id;
-} usb_hid_callback_mapping;
-
-/*----------------------------------------------------------------------------*/
-
 /* Array of endpoints expected on the device, NULL terminated. */
 usb_endpoint_description_t *usb_hid_endpoints[USB_HID_POLL_EP_COUNT + 1] = {

uspace/drv/usbhid/usbhid.h

@@ -34 +34 @@
  */
 
-#ifndef USB_USBHID_H_
-#define USB_USBHID_H_
+#ifndef USB_HID_USBHID_H_
+#define USB_HID_USBHID_H_
 
 #include <stdint.h>
@@ -63 +63 @@
         usb_hid_driver_poll_ended poll_end;
 } usb_hid_subdriver_t;
+
+/*----------------------------------------------------------------------------*/
+
+typedef struct usb_hid_callback_mapping {
+        usb_hid_report_path_t *path;
+        char *vendor_id;
+        char *product_id;
+} usb_hid_callback_mapping_t;
 
 /*----------------------------------------------------------------------------*/
@@ -126 +134 @@
 void usb_hid_free(usb_hid_dev_t **hid_dev);
 
-#endif /* USB_USBHID_H_ */
+#endif /* USB_HID_USBHID_H_ */
 
 /**