Changeset c2fa801 in mainline

Timestamp:

2011-02-27T00:23:19Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

2391aaf, 81c508c

Parents:

882f8b1

Message:

Removed unused code.

• Removed HID descriptor parser (completely).
• Removed descriptor dump from usbhid makefile (not needed), but retained the source files (may be useful).
• Lowered log level to INFO.

Location:

uspace/drv/usbhid

Files:

• Makefile (modified) (1 diff)
• descparser.c (deleted)
• descparser.h (deleted)
• hid.h (modified) (2 diffs)
• main.c (modified) (3 diffs)

uspace/drv/usbhid/Makefile

@@ -39 +39 @@
 SOURCES = \
         main.c \
-        descparser.c \
-        descdump.c \
         conv.c \
         $(STOLEN_LAYOUT_SOURCES)

uspace/drv/usbhid/hid.h

@@ -44 +44 @@
 
 /**
- *
- */
-typedef struct {
-        usb_standard_interface_descriptor_t iface_desc;
-        usb_standard_endpoint_descriptor_t *endpoints;
-        usb_standard_hid_descriptor_t hid_desc;
-        uint8_t *report_desc;
-        //usb_standard_hid_class_descriptor_info_t *class_desc_info;
-        //uint8_t **class_descs;
-} usb_hid_iface_t;
-
-/**
- *
- */
-typedef struct {
-        usb_standard_configuration_descriptor_t config_descriptor;
-        usb_hid_iface_t *interfaces;
-} usb_hid_configuration_t;
-
-/**
  * @brief USB/HID keyboard device type.
  *
@@ -88 +68 @@
 } usb_hid_dev_kbd_t;
 
-// TODO: more configurations!
-
 #endif

uspace/drv/usbhid/main.c

@@ -54 +54 @@
 #include <usb/dp.h>
 #include "hid.h"
-//#include "descparser.h"
-//#include "descdump.h"
 #include "conv.h"
 #include "layout.h"
@@ -916 +914 @@
         }
 
+        usb_log_info("Device initialized.\n");
+        
         /*
          * Create new fibril for handling this keyboard
@@ -948 +948 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_MAX, NAME);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
         return ddf_driver_main(&kbd_driver);
 }