Changeset bb58dc0b in mainline for uspace/drv/bus/usb/ohci/root_hub.c

Timestamp:

2011-07-11T15:29:03Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

56c6b88

Parents:

40c6cdf

Message:

OHCI: Root hub: Remove small useless functions.

File:

• uspace/drv/bus/usb/ohci/root_hub.c (modified) (5 diffs)

uspace/drv/bus/usb/ohci/root_hub.c

@@ -165 +165 @@
     rh_t *instance, usb_transfer_batch_t *request);
 
-
 static int get_descriptor_request(
     rh_t *instance, usb_transfer_batch_t *request);
 
-static int get_configuration_request(
-    rh_t *instance, usb_transfer_batch_t *request);
-
 static int port_feature_set_request(
     rh_t *instance, uint16_t feature, uint16_t port);
@@ -194 +190 @@
 static bool is_zeros(const void *buffer, size_t size);
 
-/**
- * Register address to this device
- *
- * @param instance Root hub instance
- * @param address New address
- * @return Error code
- */
-static inline int address_set_request(rh_t *instance, uint16_t address)
-        { return ENOTSUP; }
+
+#define TRANSFER_OK(bytes) \
+do { \
+        request->transfered_size = bytes; \
+        return EOK; \
+while (0);
 
 /** Root hub initialization
@@ -564 +557 @@
 /*----------------------------------------------------------------------------*/
 /**
- * Answer to get configuration request.
- *
- * Root hub works independently on the configuration.
- * Set and get configuration requests do not have any meaning,
- * dummy values are returned.
- *
- * @param instance Root hub instance
- * @param request Structure containing both request and response information
- * @return Error code
- */
-int get_configuration_request(
-    rh_t *instance, usb_transfer_batch_t *request)
-{
-        assert(request);
-
-        if (request->buffer_size != 1)
-                return EINVAL;
-        request->data_buffer[0] = 1;
-        request->transfered_size = 1;
-
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-/**
  * process feature-enabling request on hub
  *
@@ -671 +640 @@
         case USB_DEVREQ_GET_CONFIGURATION:
                 usb_log_debug("USB_DEVREQ_GET_CONFIGURATION\n");
-                return get_configuration_request(instance, request);
+                if (request->buffer_size != 1)
+                        return EINVAL;
+                request->data_buffer[0] = 1;
+                request->transfered_size = 1;
+                return EOK;
         }
         return ENOTSUP;
@@ -767 +740 @@
         case USB_DEVREQ_SET_ADDRESS:
                 usb_log_debug("USB_DEVREQ_SET_ADDRESS\n");
-                return address_set_request(instance, setup_request->value);
+                return ENOTSUP;
 
         default: