Changeset fa2f79d in mainline for uspace/lib

Timestamp:

2011-02-15T21:26:05Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

563fb40

Parents:

47c573a (diff), f294926 (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 development/ changes

Location:

uspace/lib

Files:

• c/generic/str_error.c (modified) (2 diffs)
• c/include/errno.h (modified) (1 diff)
• drv/generic/remote_usbhc.c (modified) (3 diffs)
• drv/include/usbhc_iface.h (modified) (1 diff)
• usb/Makefile (modified) (2 diffs)
• usb/include/usb/hub.h (added)
• usb/include/usb/pipes.h (modified) (3 diffs)
• usb/include/usb/usb.h (modified) (1 diff)
• usb/include/usb/usbdevice.h (added)
• usb/src/hub.c (added)
• usb/src/pipes.c (modified) (1 diff)
• usb/src/usb.c (modified) (1 diff)
• usb/src/usbdevice.c (added)

uspace/lib/c/generic/str_error.c

@@ -33 +33 @@
  */
 
+#include <errno.h>
 #include <str_error.h>
 #include <stdio.h>
@@ -63 +64 @@
 static fibril_local char noerr[NOERR_LEN];
 
-const char *str_error(const int errno)
+const char *str_error(const int e)
 {
-        if ((errno <= 0) && (errno >= MIN_ERRNO))
-                return err_desc[-errno];
+        if ((e <= 0) && (e >= MIN_ERRNO))
+                return err_desc[-e];
         
-        snprintf(noerr, NOERR_LEN, "Unkown error code %d", errno);
+        /* Ad hoc descriptions of error codes interesting for USB. */
+        switch (e) {
+                case EBADCHECKSUM:
+                        return "Bad checksum";
+                case EAGAIN:
+                        return "Resource temporarily unavailable";
+                default:
+                        break;
+        }
+
+        snprintf(noerr, NOERR_LEN, "Unkown error code %d", e);
         return noerr;
 }

uspace/lib/c/include/errno.h

@@ -56 +56 @@
 #define EMLINK        (-266)
 
+/** Bad checksum. */
+#define EBADCHECKSUM  (-300)
+
 /** An API function is called while another blocking function is in progress. */
 #define EINPROGRESS  (-10036)

uspace/lib/drv/generic/remote_usbhc.c

@@ -240 +240 @@
 
 static void callback_out(device_t *device,
-    usb_transaction_outcome_t outcome, void *arg)
+    int outcome, void *arg)
 {
         async_transaction_t *trans = (async_transaction_t *)arg;
@@ -250 +250 @@
 
 static void callback_in(device_t *device,
-    usb_transaction_outcome_t outcome, size_t actual_size, void *arg)
+    int outcome, size_t actual_size, void *arg)
 {
         async_transaction_t *trans = (async_transaction_t *)arg;
 
-        if (outcome != USB_OUTCOME_OK) {
+        if (outcome != EOK) {
                 async_answer_0(trans->caller, outcome);
                 if (trans->data_caller) {
@@ -270 +270 @@
         }
 
-        async_answer_0(trans->caller, USB_OUTCOME_OK);
+        async_answer_0(trans->caller, EOK);
 
         async_transaction_destroy(trans);

uspace/lib/drv/include/usbhc_iface.h

@@ -207 +207 @@
 /** Callback for outgoing transfer. */
 typedef void (*usbhc_iface_transfer_out_callback_t)(device_t *,
-    usb_transaction_outcome_t, void *);
+    int, void *);
 
 /** Callback for incoming transfer. */
 typedef void (*usbhc_iface_transfer_in_callback_t)(device_t *,
-    usb_transaction_outcome_t, size_t, void *);
+    int, size_t, void *);
 
 

uspace/lib/usb/Makefile

@@ -40 +40 @@
         src/dump.c \
         src/hidparser.c \
+        src/hub.c \
         src/pipes.c \
         src/pipesinit.c \
@@ -46 +47 @@
         src/request.c \
         src/usb.c \
+        src/usbdevice.c \
         src/usbdrvreq.c \
         src/usbdrv.c \

uspace/lib/usb/include/usb/pipes.h

@@ -31 +31 @@
  */
 /** @file
- * Communication between device drivers and host controller driver.
+ * USB pipes representation.
  */
 #ifndef LIBUSB_PIPES_H_
@@ -38 +38 @@
 #include <sys/types.h>
 #include <usb/usb.h>
+#include <usb/usbdevice.h>
 #include <usb/descriptor.h>
 #include <ipc/devman.h>
@@ -114 +115 @@
 } usb_endpoint_mapping_t;
 
+int usb_device_connection_initialize_on_default_address(
+    usb_device_connection_t *, usb_hc_connection_t *);
 int usb_device_connection_initialize_from_device(usb_device_connection_t *,
     device_t *);

uspace/lib/usb/include/usb/usb.h

@@ -83 +83 @@
 } usb_request_recipient_t;
 
-/** USB transaction outcome. */
-typedef enum {
-        USB_OUTCOME_OK,
-        USB_OUTCOME_CRCERROR,
-        USB_OUTCOME_BABBLE
-} usb_transaction_outcome_t;
-
-const char * usb_str_transaction_outcome(usb_transaction_outcome_t o);
-
 /** USB address type.
  * Negative values could be used to indicate error.

uspace/lib/usb/src/pipes.c

@@ -102 +102 @@
 }
 
+/** Initialize connection to USB device on default address.
+ *
+ * @param dev_connection Device connection structure to be initialized.
+ * @param hc_connection Initialized connection to host controller.
+ * @return Error code.
+ */
+int usb_device_connection_initialize_on_default_address(
+    usb_device_connection_t *dev_connection,
+    usb_hc_connection_t *hc_connection)
+{
+        assert(dev_connection);
+
+        if (hc_connection == NULL) {
+                return EBADMEM;
+        }
+
+        return usb_device_connection_initialize(dev_connection,
+            hc_connection->hc_handle, (usb_address_t) 0);
+}
+
 
 /** Start a session on the endpoint pipe.

uspace/lib/usb/src/usb.c

@@ -54 +54 @@
 }
 
-/** String representation of USB transaction outcome. */
-const char * usb_str_transaction_outcome(usb_transaction_outcome_t o)
-{
-        switch (o) {
-                case USB_OUTCOME_OK:
-                        return "ok";
-                case USB_OUTCOME_CRCERROR:
-                        return "CRC error";
-                case USB_OUTCOME_BABBLE:
-                        return "babble";
-                default:
-                        return "unknown";
-        }
-}
-
-
 /**
  * @}