Changeset 151293d in mainline

Timestamp:

2011-05-27T16:10:41Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4166fb1, 6bbbcabe

Parents:

49ce810 (diff), 567a3e2 (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:

merge with development

Location:

uspace

Files:

• app/mkbd/main.c (modified) (2 diffs)
• drv/ohci/hc.c (modified) (1 diff)
• drv/uhci-hcd/uhci.c (modified) (4 diffs)
• drv/usbhid/mouse/mousedev.c (modified) (1 diff)
• lib/drv/include/remote_pci.h (modified) (1 diff)
• lib/drv/include/remote_usb.h (modified) (1 diff)
• lib/drv/include/remote_usbhc.h (modified) (1 diff)

uspace/app/mkbd/main.c

@@ -212 +212 @@
         }
         
-        //char *devpath = argv[1];
-        const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
+        char *devpath = argv[1];
+        //const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
         
         int rc;
@@ -297 +297 @@
                 }
                 
-                async_usleep(100000);
+                async_usleep(10000);
         }
         

uspace/drv/ohci/hc.c

@@ -343 +343 @@
 {
         assert(instance);
-        usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);
         if ((status & ~I_SF) == 0) /* ignore sof status */
                 return;
+        usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
         if (status & I_RHSC)
                 rh_interrupt(&instance->rh);

uspace/drv/uhci-hcd/uhci.c

@@ -61 +61 @@
 } uhci_t;
 
-static inline uhci_t * dev_to_uhci(ddf_dev_t *dev)
+static inline uhci_t * dev_to_uhci(const ddf_dev_t *dev)
 {
         assert(dev);
@@ -77 +77 @@
 {
         assert(dev);
-        uhci_t *uhci = dev->driver_data;
-        assert(uhci);
+        uhci_t *uhci = dev_to_uhci(dev);
         hc_t *hc = &uhci->hc;
-        uint16_t status = IPC_GET_ARG1(*call);
+        const uint16_t status = IPC_GET_ARG1(*call);
         assert(hc);
         hc_interrupt(hc, status);
 }
+/*----------------------------------------------------------------------------*/
+/** Operations supported by the HC driver */
+static ddf_dev_ops_t hc_ops = {
+        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
+};
 /*----------------------------------------------------------------------------*/
 /** Get address of the device identified by handle.
@@ -115 +119 @@
  * @return Error code.
  */
-static int usb_iface_get_hc_handle(
-    ddf_fun_t *fun, devman_handle_t *handle)
+static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
@@ -131 +134 @@
         .get_hc_handle = usb_iface_get_hc_handle,
         .get_address = usb_iface_get_address
-};
-/*----------------------------------------------------------------------------*/
-/** Operations supported by the HC driver */
-static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
 };
 /*----------------------------------------------------------------------------*/

uspace/drv/usbhid/mouse/mousedev.c

@@ -234 +234 @@
         
         if (mouse_dev->mouse_phone < 0) {
-                usb_log_error(NAME " No console phone.\n");
-                return false;   // ??
+                usb_log_warning(NAME " No console phone.\n");
+                return true;
         }
 

uspace/lib/drv/include/remote_pci.h

@@ -36 +36 @@
 #define LIBDRV_REMOTE_PCI_H_
 
-remote_iface_t remote_pci_iface;
+extern remote_iface_t remote_pci_iface;
 
 #endif

uspace/lib/drv/include/remote_usb.h

@@ -36 +36 @@
 #define LIBDRV_REMOTE_USB_H_
 
-remote_iface_t remote_usb_iface;
+extern remote_iface_t remote_usb_iface;
 
 #endif

uspace/lib/drv/include/remote_usbhc.h

@@ -36 +36 @@
 #define LIBDRV_REMOTE_USBHC_H_
 
-remote_iface_t remote_usbhc_iface;
+extern remote_iface_t remote_usbhc_iface;
 
 #endif