Changeset f1d6866 in mainline for uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c

Timestamp:

2011-09-18T21:22:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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 mainline changes

File:

• uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (modified) (4 diffs)

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c

@@ -61 +61 @@
  */
 void td_init(td_t *instance, int err_count, size_t size, bool toggle, bool iso,
-    bool low_speed, usb_target_t target, usb_packet_id pid, void *buffer,
-    td_t *next)
+    bool low_speed, usb_target_t target, usb_packet_id pid, const void *buffer,
+    const td_t *next)
 {
         assert(instance);
@@ -113 +113 @@
  * @return Error code.
  */
-int td_status(td_t *instance)
+int td_status(const td_t *instance)
 {
         assert(instance);
@@ -119 +119 @@
         /* This is hc internal error it should never be reported. */
         if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0)
-                return EAGAIN;
+                return EIO;
 
         /* CRC or timeout error, like device not present or bad data,
@@ -150 +150 @@
  * @param[in] instance TD structure to use.
  */
-void td_print_status(td_t *instance)
+void td_print_status(const td_t *instance)
 {
         assert(instance);