Changes in / [ed0cc81:2df648c2] in mainline

Location:

uspace

Files:

• app/mkbd/main.c (modified) (2 diffs)
• drv/ohci/root_hub.c (modified) (10 diffs)
• drv/usbhid/mouse/mousedev.c (modified) (1 diff)
• drv/usbhub/usbhub.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(10000);
+                async_usleep(100000);
         }
         

uspace/drv/ohci/root_hub.c

@@ -61 +61 @@
         .vendor_id = 0x16db,
         .product_id = 0x0001,
+        /// \TODO these values migt be different
         .str_serial_number = 0,
         .usb_spec_version = 0x110,
@@ -118 +119 @@
 static const uint32_t hub_clear_feature_by_writing_one_mask =
    RHS_CLEAR_PORT_POWER;
+   // 1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER;
 
 /**
@@ -125 +127 @@
     RHS_LPSC_FLAG |
     RHS_OCIC_FLAG;
+    //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) |
+    //(1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
 
 /**
@@ -131 +135 @@
 static const uint32_t hub_set_feature_direct_mask =
     RHS_SET_PORT_POWER;
+    //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
 
 /**
@@ -155 +160 @@
     RHPS_PRSC_FLAG;
 
+/*
+
+    (1 << USB_HUB_FEATURE_PORT_CONNECTION) |
+    (1 << USB_HUB_FEATURE_PORT_SUSPEND) |
+    (1 << USB_HUB_FEATURE_PORT_OVER_CURRENT) |
+    (1 << USB_HUB_FEATURE_PORT_POWER) |
+    (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
+    (1 << USB_HUB_FEATURE_C_PORT_ENABLE) |
+    (1 << USB_HUB_FEATURE_C_PORT_SUSPEND) |
+    (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
+    (1 << USB_HUB_FEATURE_C_PORT_RESET);
+ */
 //note that USB_HUB_FEATURE_PORT_POWER bit is translated into
 //USB_HUB_FEATURE_PORT_LOW_SPEED for port set feature request
@@ -162 +179 @@
  */
 static const uint32_t port_status_change_mask = RHPS_CHANGE_WC_MASK;
+/*    (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
+    (1 << USB_HUB_FEATURE_C_PORT_ENABLE) |
+    (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
+    (1 << USB_HUB_FEATURE_C_PORT_RESET) |
+    (1 << USB_HUB_FEATURE_C_PORT_SUSPEND);
+*/
 
 static int create_serialized_hub_descriptor(rh_t *instance);
@@ -410 +433 @@
         if (port < 1 || port > instance->port_count)
                 return EINVAL;
+        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
         request->transfered_size = 4;
-        uint32_t data = instance->registers->rh_port_status[port - 1];
-        memcpy(request->data_buffer,&data,4);
+        uint32_buffer[0] = instance->registers->rh_port_status[port - 1];
 #if 0
         int i;
@@ -439 +462 @@
 static int process_get_hub_status_request(rh_t *instance,
     usb_transfer_batch_t * request) {
-        //uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
+        uint32_t * uint32_buffer = (uint32_t*) request->data_buffer;
         request->transfered_size = 4;
         //bits, 0,1,16,17
         uint32_t mask = 1 | (1 << 1) | (1 << 16) | (1 << 17);
-        uint32_t data = mask & instance->registers->rh_status;
-        //uint32_buffer[0] = mask & instance->registers->rh_status;
-        memcpy(request->data_buffer,&data,4);
+        uint32_buffer[0] = mask & instance->registers->rh_status;
 
         return EOK;
@@ -499 +520 @@
             | (1 << (USB_HUB_FEATURE_C_HUB_OVER_CURRENT + 16));
         bzero(bitmap, instance->interrupt_mask_size);
-        if ((instance->registers->rh_status & mask) !=0 ) {
+        if (instance->registers->rh_status & mask) {
                 bitmap[0] = 1;
         }
@@ -505 +526 @@
         mask = port_status_change_mask;
         for (port = 1; port <= instance->port_count; ++port) {
-                if ((mask & instance->registers->rh_port_status[port - 1]) != 0) {
+                if (mask & instance->registers->rh_port_status[port - 1]) {
 
                         bitmap[(port) / 8] += 1 << (port % 8);

uspace/drv/usbhid/mouse/mousedev.c

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

uspace/drv/usbhub/usbhub.c

@@ -440 +440 @@
  *
  * The change can be either in the over-current condition or
- * local-power change.
+ * local-power lost condition.
  * @param hub_info hub instance
  */

uspace/lib/drv/include/remote_pci.h

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

uspace/lib/drv/include/remote_usb.h

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

uspace/lib/drv/include/remote_usbhc.h

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