Changeset 82122f3 in mainline for uspace/lib/usb

Timestamp:

2010-12-17T14:51:41Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (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:

Merged development into lelian/hidd

Location:

uspace/lib/usb

Files:

• Makefile (modified) (2 diffs)
• include/usb/classes/classes.h (modified) (1 diff)
• include/usb/classes/hid.h (modified) (1 diff)
• include/usb/usb.h (modified) (1 diff)
• include/usb/usbdrv.h (modified) (1 diff)
• src/addrkeep.c (modified) (1 diff)
• src/class.c (moved) (moved from kernel/generic/include/syscall/sysarg64.h ) (2 diffs)
• src/recognise.c (added)
• src/usbdrv.c (modified) (6 diffs)

uspace/lib/usb/Makefile

@@ -34 +34 @@
 SOURCES = \
         src/addrkeep.c \
+        src/class.c \
         src/debug.c \
         src/drvpsync.c \
@@ -40 +41 @@
         src/hidparser.c \
         src/localdrv.c \
+        src/recognise.c \
         src/remotedrv.c \
         src/usb.c \

uspace/lib/usb/include/usb/classes/classes.h

@@ -60 +60 @@
 } usb_class_t;
 
+const char *usb_str_class(usb_class_t);
 
 #endif

uspace/lib/usb/include/usb/classes/hid.h

@@ -127 +127 @@
         usb_hid_configuration_t *conf;
         usb_address_t address;
-        usb_endpoint_t default_ep;
+        usb_endpoint_t poll_endpoint;
         usb_hid_report_parser_t *parser;
 } usb_hid_dev_kbd_t;

uspace/lib/usb/include/usb/usb.h

@@ -101 +101 @@
  * Used by various USB functions as opaque handle.
  */
-typedef ipcarg_t usb_handle_t;
+typedef sysarg_t usb_handle_t;
 
 /** USB packet identifier. */

uspace/lib/usb/include/usb/usbdrv.h

@@ -94 +94 @@
 int usb_drv_async_wait_for(usb_handle_t);
 
+int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
+int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,
+    devman_handle_t *);
+
 
 #endif

uspace/lib/usb/src/addrkeep.c

@@ -199 +199 @@
                         usb_address_keeping_used_t *last
                             = used_address_get_instance(addresses->used_addresses.next);
-                        free_address = last->address;
+                        free_address = last->address + 1;
                 }
         }

uspace/lib/usb/src/class.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup libusb usb
  * @{
  */
+/** @file
+ * @brief Class related functions.
+ */
+#include <usb/classes/classes.h>
+#include <errno.h>
+
+/** Tell string representation of USB class.
+ *
+ * @param cls Class code.
+ * @return String representation.
+ */
+const char *usb_str_class(usb_class_t cls)
+{
+        switch (cls) {
+                case USB_CLASS_USE_INTERFACE:
+                        return "use-interface";
+                case USB_CLASS_AUDIO:
+                        return "audio";
+                case USB_CLASS_COMMUNICATIONS_CDC_CONTROL:
+                        return "communications";
+                case USB_CLASS_HID:
+                        return "HID";
+                case USB_CLASS_PHYSICAL:
+                        return "physical";
+                case USB_CLASS_IMAGE:
+                        return "image";
+                case USB_CLASS_PRINTER:
+                        return "printer";
+                case USB_CLASS_MASS_STORAGE:
+                        return "mass-storage";
+                case USB_CLASS_HUB:
+                        return "hub";
+                case USB_CLASS_CDC_DATA:
+                        return "CDC";
+                case USB_CLASS_SMART_CARD:
+                        return "smart-card";
+                case USB_CLASS_CONTENT_SECURITY:
+                        return "security";
+                case USB_CLASS_VIDEO:
+                        return "video";
+                case USB_CLASS_PERSONAL_HEALTHCARE:
+                        return "healthcare";
+                case USB_CLASS_DIAGNOSTIC:
+                        return "diagnostic";
+                case USB_CLASS_WIRELESS_CONTROLLER:
+                        return "wireless";
+                case USB_CLASS_MISCELLANEOUS:
+                        return "misc";
+                case USB_CLASS_APPLICATION_SPECIFIC:
+                        return "application";
+                case USB_CLASS_VENDOR_SPECIFIC:
+                        return "vendor";
+                default:
+                        return "unknown";
+        }
+}
+
 
 /**
- * @file
- * @brief Wrapper for explicit 64-bit arguments passed to syscalls.
+ * @}
  */
-
-#ifndef KERN_SYSARG64_H_
-#define KERN_SYSARG64_H_
-
-typedef struct {
-        unsigned long long value;
-} sysarg64_t;
-
-#endif
-
-/** @}
- */

uspace/lib/usb/src/usbdrv.c

@@ -72 +72 @@
         devman_handle_t handle;
 
-        rc = devman_device_get_handle("/virt/usbhc", &handle, 0);
+        rc = devman_device_get_handle("/virt/usbhc", &handle, flags);
         if (rc != EOK) {
                 return rc;
         }
         
-        int phone = devman_device_connect(handle, 0);
+        int phone = devman_device_connect(handle, flags);
 
         return phone;
@@ -90 +90 @@
 usb_address_t usb_drv_get_my_address(int phone, device_t *dev)
 {
-        ipcarg_t address;
+        sysarg_t address;
         int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_GET_ADDRESS,
@@ -132 +132 @@
 usb_address_t usb_drv_request_address(int phone)
 {
-        ipcarg_t address;
+        sysarg_t address;
         int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_REQUEST_ADDRESS, &address);
@@ -298 +298 @@
  * @return Error status.
  */
-static int read_buffer_in(int phone, ipcarg_t hash,
+static int read_buffer_in(int phone, sysarg_t hash,
     void *buffer, size_t size, size_t *actual_size)
 {
         ipc_call_t answer_data;
-        ipcarg_t answer_rc;
+        sysarg_t answer_rc;
         aid_t req;
         int rc;
@@ -350 +350 @@
         transfer_info_t *transfer = (transfer_info_t *) handle;
 
-        ipcarg_t answer_rc;
+        sysarg_t answer_rc;
         async_wait_for(transfer->request, &answer_rc);
 
@@ -367 +367 @@
                  * We will use it when actually reading-in the data.
                  */
-                ipcarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
+                sysarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
                 if (buffer_hash == 0) {
                         rc = ENOENT;