Changeset d7c72db in mainline for uspace/lib/drv/generic

Timestamp:

2011-05-24T21:01: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:

a28b41d

Parents:

4e78236

Message:

A lot of changes to mkbd and HID interface.

• mkbd Report parser initialization (getting report descriptor, parsing).
• Getting report descriptor and its length from HID device added to HID interface (client and server stubs not implemented).
• Fixed event type to uint8_t *.
• Implemented these functions in generic HID driver.
• Moved mapping from Consumer page usages to string descriptions moved to libusbhid.
• Removed some temporary debug output.

Location:

uspace/lib/drv/generic

Files:

• dev_iface.c (modified) (2 diffs)
• remote_usbhid.c (modified) (4 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -61 +61 @@
 remote_iface_t *get_remote_iface(int idx)
 {
-        printf("get_remote_iface(): idx: %d\n", idx);
         assert(is_valid_iface_idx(idx));
-        printf("remote iface: %p\n", remote_ifaces.ifaces[idx]);
-        
-        printf("remote_usbhid_iface ptr: %p\n", &remote_usbhid_iface);
         
         return remote_ifaces.ifaces[idx];
@@ -73 +69 @@
 get_remote_method(remote_iface_t *rem_iface, sysarg_t iface_method_idx)
 {
-        printf("remote iface: %p\n", rem_iface);
-        printf("Method count: %d\n", rem_iface->method_count);
         if (iface_method_idx >= rem_iface->method_count) {
                 return NULL;

uspace/lib/drv/generic/remote_usbhid.c

@@ -43 +43 @@
 static void remote_usbhid_get_event_length(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhid_get_event(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhid_get_report_descriptor_length(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhid_get_report_descriptor(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 // static void remote_usbhid_(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 
@@ -48 +50 @@
 static remote_iface_func_ptr_t remote_usbhid_iface_ops [] = {
         remote_usbhid_get_event_length,
-        remote_usbhid_get_event
+        remote_usbhid_get_event,
+        remote_usbhid_get_report_descriptor_length,
+        remote_usbhid_get_report_descriptor
 };
 
@@ -117 +121 @@
         int rc;
 
-        int32_t *data = malloc(len);
+        uint8_t *data = malloc(len);
         if (data == NULL) {
                 async_answer_0(data_callid, ENOMEM);
@@ -143 +147 @@
 }
 
+void remote_usbhid_get_report_descriptor(ddf_fun_t *fun, void *iface, 
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        /** @todo Implement! */
+}
+
+void remote_usbhid_get_report_descriptor_length(ddf_fun_t *fun, void *iface, 
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        /** @todo Implement! */
+}
+
 /**
  * @}