Changeset 58775d30 in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (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:

Mainline changes

File:

• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (7 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -109 +109 @@
         {
                 .base = 0,
-                .size = sizeof(cuda_t) 
+                .size = sizeof(cuda_t)
         }
 };
@@ -157 +157 @@
 
         printf(NAME ": VIA-CUDA Apple Desktop Bus driver\n");
+        
+        /*
+         * Alleviate the virtual memory / page table pressure caused by
+         * interrupt storms when the default large stacks are used.
+         */
+        async_set_notification_handler_stack_size(PAGE_SIZE);
 
         for (i = 0; i < ADB_MAX_ADDR; ++i) {
@@ -306 +312 @@
         fibril_mutex_lock(&instance->dev_lock);
 
+        switch (instance->xstate) {
+        case cx_listen:
+                cuda_irq_listen();
+                break;
+        case cx_receive:
+                cuda_irq_receive();
+                break;
+        case cx_rcv_end:
+                cuda_irq_rcv_end(rbuf, &len);
+                handle = true;
+                break;
+        case cx_send_start:
+                cuda_irq_send_start();
+                break;
+        case cx_send:
+                cuda_irq_send();
+                break;
+        }
+        
         /* Lower IFR.SR_INT so that CUDA can generate next int by raising it. */
         pio_write_8(&instance->cuda->ifr, SR_INT);
-
-        switch (instance->xstate) {
-        case cx_listen: cuda_irq_listen(); break;
-        case cx_receive: cuda_irq_receive(); break;
-        case cx_rcv_end: cuda_irq_rcv_end(rbuf, &len);
-            handle = true; break;
-        case cx_send_start: cuda_irq_send_start(); break;
-        case cx_send: cuda_irq_send(); break;
-        }
 
         fibril_mutex_unlock(&instance->dev_lock);
@@ -331 +347 @@
 static void cuda_irq_listen(void)
 {
-        uint8_t b;
-
-        b = pio_read_8(&dev->b);
-
+        uint8_t b = pio_read_8(&dev->b);
+        
         if ((b & TREQ) != 0) {
                 printf("cuda_irq_listen: no TREQ?!\n");
                 return;
         }
-
-        pio_read_8(&dev->sr);
-        pio_write_8(&dev->b, pio_read_8(&dev->b) & ~TIP);
+        
+        pio_write_8(&dev->b, b & ~TIP);
         instance->xstate = cx_receive;
 }
@@ -351 +364 @@
 static void cuda_irq_receive(void)
 {
-        uint8_t b, data;
-
-        data = pio_read_8(&dev->sr);
+        uint8_t data = pio_read_8(&dev->sr);
         if (instance->bidx < CUDA_RCV_BUF_SIZE)
                 instance->rcv_buf[instance->bidx++] = data;
-
-        b = pio_read_8(&dev->b);
-
+        
+        uint8_t b = pio_read_8(&dev->b);
+        
         if ((b & TREQ) == 0) {
                 pio_write_8(&dev->b, b ^ TACK);
@@ -374 +385 @@
 static void cuda_irq_rcv_end(void *buf, size_t *len)
 {
-        uint8_t b;
-        
-        b = pio_read_8(&dev->b);
-        pio_read_8(&dev->sr);
+        uint8_t b = pio_read_8(&dev->b);
         
         if ((b & TREQ) == 0) {
@@ -523 +531 @@
 }
 
-
 /** @}
  */