Changeset a7528a16 in mainline

Timestamp:

2011-03-18T14:58:29Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

11ac272, e93e319

Parents:

a83e138

Message:

speed on port is low/full/high

Location:

uspace/drv/usbhub

Files:

• port_status.h (modified) (1 diff)
• usbhub.c (modified) (3 diffs)

uspace/drv/usbhub/port_status.h

@@ -270 +270 @@
 }
 
+//low speed device attached
+static inline bool usb_port_high_speed(usb_port_status_t * status){
+        return usb_port_get_bit(status,10);
+}
+
+static inline void usb_port_set_high_speed(usb_port_status_t * status,bool high_speed){
+        usb_port_set_bit(status,10,high_speed);
+}
+
+static inline usb_speed_t usb_port_speed(usb_port_status_t * status){
+        if(usb_port_low_speed(status))
+                return USB_SPEED_LOW;
+        if(usb_port_high_speed(status))
+                return USB_SPEED_HIGH;
+        return USB_SPEED_FULL;
+}
+
 
 //connect change

uspace/drv/usbhub/usbhub.c

@@ -402 +402 @@
  */
 static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
-                bool isLowSpeed) {
+                usb_speed_t speed) {
         //if this hub already uses default address, it cannot request it once more
         if(hub->is_default_address_used) return;
@@ -411 +411 @@
         assert(hub->endpoints.control.hc_phone);
         //get default address
-        usb_speed_t speed = isLowSpeed?USB_SPEED_LOW:USB_SPEED_FULL;
         opResult = usb_hc_reserve_default_address(&hub->connection, speed);
         
@@ -617 +616 @@
                 if (usb_port_dev_connected(&status)) {
                         usb_log_info("some connection changed");
-                        usb_hub_init_add_device(hub, port, usb_port_low_speed(&status));
+                        usb_hub_init_add_device(hub, port, usb_port_speed(&status));
                 } else {
                         usb_hub_removed_device(hub, port);