Changeset 4e78236 in mainline for uspace/lib/drv

Timestamp:

2011-05-24T19:10:49Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d7c72db

Parents:

e7079cf

Message:

Fixed mkbd and corresponding library functions.

• Fixed linking remote_usbhid.c
• Added some temporary debug output.
• Fix in hiddev.c.

Location:

uspace/lib/drv

Files:

• Makefile (modified) (1 diff)
• generic/dev_iface.c (modified) (3 diffs)
• generic/driver.c (modified) (1 diff)
• generic/remote_usbhid.c (modified) (3 diffs)
• include/remote_usbhid.h (modified) (1 diff)

uspace/lib/drv/Makefile

@@ -40 +40 @@
         generic/remote_usb.c \
         generic/remote_pci.c \
-        generic/remote_usbhc.c
+        generic/remote_usbhc.c \
+        generic/remote_usbhid.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/drv/generic/dev_iface.c

@@ -46 +46 @@
 #include "remote_pci.h"
 
+#include <stdio.h>
+
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
@@ -59 +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];
 }
@@ -66 +73 @@
 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/driver.c

@@ -397 +397 @@
                          * handling ("remote interface").
                          */
+                        printf("iface_idx: %d\n", iface_idx);
                         remote_iface_t *rem_iface = get_remote_iface(iface_idx);
                         assert(rem_iface != NULL);

uspace/lib/drv/generic/remote_usbhid.c

@@ -36 +36 @@
 #include <errno.h>
 #include <assert.h>
+#include <stdio.h>
 
 #include "usbhid_iface.h"
@@ -58 +59 @@
 };
 
-usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+//usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
 
 
@@ -75 +76 @@
 
         size_t len = hid_iface->get_event_length(fun);
-        if (len == 0) {
-                len = EEMPTY;
-        }
-        if (len < 0) {
-                async_answer_0(callid, len);
-        } else {
-                async_answer_1(callid, EOK, len);
-        }
+//      if (len == 0) {
+//              len = EEMPTY;
+//      }
+        async_answer_1(callid, EOK, len);
+        
+//      if (len < 0) {
+//              async_answer_0(callid, len);
+//      } else {
+//              async_answer_1(callid, EOK, len);
+//      }
 }
 

uspace/lib/drv/include/remote_usbhid.h

@@ -36 +36 @@
 #define LIBDRV_REMOTE_USBHID_H_
 
-remote_iface_t remote_usbhid_iface;
+extern remote_iface_t remote_usbhid_iface;
 
 #endif