Changeset f3e2663 in mainline for kernel/genarch/src/drivers/via-cuda/cuda.c

Timestamp:

2011-04-03T11:17:45Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

106743d

Parents:

10eb754 (diff), b2a081ae (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:

• kernel/genarch/src/drivers/via-cuda/cuda.c (modified) (2 diffs)

kernel/genarch/src/drivers/via-cuda/cuda.c

@@ -239 +239 @@
         cuda_instance_t *instance = irq->instance;
         cuda_t *dev = instance->cuda;
-        uint8_t data, b;
-
+        uint8_t b;
+        
         b = pio_read_8(&dev->b);
-        data = pio_read_8(&dev->sr);
-
+        pio_read_8(&dev->sr);
+        
         if ((b & TREQ) == 0) {
                 instance->xstate = cx_receive;
@@ -251 +251 @@
                 cuda_send_start(instance);
         }
-
-        memcpy(buf, instance->rcv_buf, instance->bidx);
-        *len = instance->bidx;
+        
+        memcpy(buf, instance->rcv_buf, instance->bidx);
+        *len = instance->bidx;
         instance->bidx = 0;
 }