Changeset 0e164ed in mainline

Timestamp:

2011-03-04T08:41:58Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

dde8ca4, f06c9ec

Parents:

24d943f (diff), 9a422574 (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:

Merged development - fixes.

Location:

uspace/drv

Files:

• pciintel/pci.c (modified) (3 diffs)
• uhci-hcd/batch.c (modified) (7 diffs)

uspace/drv/pciintel/pci.c

@@ -94 +94 @@
   sysarg_t apic;
   sysarg_t i8259;
+
         int irc_phone = -1;
         int irc_service = 0;
@@ -103 +104 @@
         }
 
-  if (irc_service) {
-    while (irc_phone < 0)
-      irc_phone = service_connect_blocking(irc_service, 0, 0);
-  } else {
+  if (irc_service == 0)
                 return false;
-        }
+
+        irc_phone = service_connect_blocking(irc_service, 0, 0);
+        if (irc_phone < 0)
+                return false;
 
         size_t i;
@@ -114 +115 @@
                 if (dev_data->hw_resources.resources[i].type == INTERRUPT) {
                         int irq = dev_data->hw_resources.resources[i].res.interrupt.irq;
-                        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+                        int rc = async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+                        if (rc != EOK) {
+                                async_hangup(irc_phone);
+                                return false;
+                        }
                 }
         }

uspace/drv/uhci-hcd/batch.c

@@ -35 +35 @@
 #include <str_error.h>
 
+#include <usb/usb.h>
 #include <usb/debug.h>
 
@@ -46 +47 @@
 static int batch_schedule(batch_t *instance);
 
+static void batch_control(
+    batch_t *instance, int data_stage, int status_stage);
 static void batch_call_in(batch_t *instance);
 static void batch_call_out(batch_t *instance);
@@ -93 +96 @@
         instance->transport_buffer =
            (size > 0) ? malloc32(transport_size) : NULL;
+
         if ((size > 0) && (instance->transport_buffer == NULL)) {
                 usb_log_error("Failed to allocate device accessible buffer.\n");
@@ -168 +172 @@
 {
         assert(instance);
-
         /* we are data out, we are supposed to provide data */
         memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
-
-        const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = 0;
-        /* setup stage */
-        transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT,
-            instance->setup_size, toggle, false, low_speed,
-            instance->target, USB_PID_SETUP, instance->setup_buffer,
-            &instance->tds[1]);
-
-        /* data stage */
-        size_t i = 1;
-        for (;i < instance->packets - 1; ++i) {
-                char *data =
-                    instance->transport_buffer + ((i - 1) * instance->max_packet_size);
-                toggle = 1 - toggle;
-
-                transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT,
-                    instance->max_packet_size, toggle++, false, low_speed,
-                    instance->target, USB_PID_OUT, data, &instance->tds[i + 1]);
-        }
-
-        /* status stage */
-        i = instance->packets - 1;
-        transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT,
-            0, 1, false, low_speed, instance->target, USB_PID_IN, NULL, NULL);
-
-        instance->tds[i].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
-        usb_log_debug2("Control write last TD status: %x.\n",
-                instance->tds[i].status);
-
+        batch_control(instance, USB_PID_OUT, USB_PID_IN);
         instance->next_step = batch_call_out_and_dispose;
         usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
@@ -209 +183 @@
 {
         assert(instance);
-
-        const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = 0;
-        /* setup stage */
-        transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT,
-            instance->setup_size, toggle, false, low_speed, instance->target,
-            USB_PID_SETUP, instance->setup_buffer, &instance->tds[1]);
-
-        /* data stage */
-        size_t i = 1;
-        for (;i < instance->packets - 1; ++i) {
-                char *data =
-                    instance->transport_buffer + ((i - 1) * instance->max_packet_size);
-                toggle = 1 - toggle;
-
-                transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT,
-                    instance->max_packet_size, toggle, false, low_speed,
-                                instance->target, USB_PID_IN, data, &instance->tds[i + 1]);
-        }
-
-        /* status stage */
-        i = instance->packets - 1;
-        transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT,
-            0, 1, false, low_speed, instance->target, USB_PID_OUT, NULL, NULL);
-
-        instance->tds[i].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
-        usb_log_debug2("Control read last TD status: %x.\n",
-                instance->tds[i].status);
-
+        batch_control(instance, USB_PID_IN, USB_PID_OUT);
         instance->next_step = batch_call_in_and_dispose;
         usb_log_debug("Batch(%p) CONTROL READ initialized.\n", instance);
@@ -272 +218 @@
 {
         assert(instance);
-
         memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
 
@@ -297 +242 @@
 }
 /*----------------------------------------------------------------------------*/
+static void batch_control(
+    batch_t *instance, int data_stage, int status_stage)
+{
+        assert(instance);
+
+        const bool low_speed = instance->speed == USB_SPEED_LOW;
+        int toggle = 0;
+        /* setup stage */
+        transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT,
+            instance->setup_size, toggle, false, low_speed, instance->target,
+            USB_PID_SETUP, instance->setup_buffer, &instance->tds[1]);
+
+        /* data stage */
+        size_t packet = 1;
+        size_t remain_size = instance->buffer_size;
+        while (remain_size > 0) {
+                char *data =
+                    instance->transport_buffer + instance->buffer_size
+                    - remain_size;
+
+                toggle = 1 - toggle;
+
+                const size_t packet_size =
+                    (instance->max_packet_size > remain_size) ?
+                    remain_size : instance->max_packet_size;
+
+                transfer_descriptor_init(&instance->tds[packet],
+                    DEFAULT_ERROR_COUNT, packet_size, toggle, false, low_speed,
+                    instance->target, data_stage, data,
+                    &instance->tds[packet + 1]);
+
+                ++packet;
+                assert(packet < instance->packets);
+                assert(packet_size <= remain_size);
+                remain_size -= packet_size;
+        }
+
+        /* status stage */
+        assert(packet == instance->packets - 1);
+        transfer_descriptor_init(&instance->tds[packet], DEFAULT_ERROR_COUNT,
+            0, 1, false, low_speed, instance->target, status_stage, NULL, NULL);
+
+
+        instance->tds[packet].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
+        usb_log_debug2("Control last TD status: %x.\n",
+            instance->tds[packet].status);
+}
+/*----------------------------------------------------------------------------*/
 void batch_call_in(batch_t *instance)
 {