Changeset 74a1ba9 in mainline

Timestamp:

2011-04-08T09:15:02Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e9f0348

Parents:

fec47d4

Message:

Removed unused code, fixed some typos

Location:

uspace/drv/usbhid

Files:

• generic/hiddev.h (modified) (2 diffs)
• kbd/kbddev.c (modified) (1 diff)
• kbd/kbddev.h (modified) (6 diffs)

uspace/drv/usbhid/generic/hiddev.h

@@ -34 +34 @@
  */
 
-#ifndef USB_HIDD_H_
-#define USB_HIDD_H_
+#ifndef USB_HIDDDEV_H_
+#define USB_HIDDDEV_H_
 
 #include <usb/devdrv.h>
@@ -47 +47 @@
      size_t buffer_size, void *arg);
 
-#endif // USB_HIDD_H_
+#endif // USB_HIDDDEV_H_
 
 /**

uspace/drv/usbhid/kbd/kbddev.c

@@ -238 +238 @@
  * @param icall Call data.
  */
-void default_connection_handler(ddf_fun_t *fun,
+static void default_connection_handler(ddf_fun_t *fun,
     ipc_callid_t icallid, ipc_call_t *icall)
 {

uspace/drv/usbhid/kbd/kbddev.h

@@ -65 +65 @@
  */
 typedef struct usb_kbd_t {
-        /** Structure holding generic USB device information. */
-        //usbhid_dev_t *hid_dev;
-        //usb_device_t *usb_dev;
-        
         /** Currently pressed keys (not translated to key codes). */
         uint8_t *keys;
@@ -91 +87 @@
         fibril_mutex_t *repeat_mtx;
         
-        /** Report descriptor. */
-        //uint8_t *report_desc;
-
-        /** Report descriptor size. */
-        //size_t report_desc_size;
-        
         uint8_t *output_buffer;
         
@@ -106 +96 @@
         
         int32_t *led_data;
-
-        /** HID Report parser. */
-        //usb_hid_report_parser_t *parser;
         
         /** State of the structure (for checking before use). 
@@ -121 +108 @@
 /*----------------------------------------------------------------------------*/
 
-//enum {
-//      USB_KBD_POLL_EP_NO = 0,
-//      USB_HID_POLL_EP_NO = 1,
-//      USB_KBD_POLL_EP_COUNT = 2
-//};
-
-//usb_endpoint_description_t *usb_kbd_endpoints[USB_KBD_POLL_EP_COUNT + 1];
-
-//ddf_dev_ops_t keyboard_ops;
-
 usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
 
@@ -138 +115 @@
 /*----------------------------------------------------------------------------*/
 
-//usb_kbd_t *usb_kbd_new(void);
-
 int usb_kbd_init(struct usb_hid_dev_t *hid_dev);
 
 bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer,
      size_t buffer_size, void *arg);
-
-//void usb_kbd_polling_ended_callback(usb_device_t *dev, bool reason, 
-//     void *arg);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
@@ -157 +129 @@
     int type, unsigned int key);
 
-
 void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev);