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

Timestamp:

2011-03-29T21:59:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

563b538, ad7a6c9

Parents:

ebebd38 (diff), 3abfe9a8 (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 toolchain upgrade and related changes. Highlights:

• GCC 4.6, binutils 2.21
• change the default CROSS_PREFIX to /usr/local/cross to avoid ugly pollution in the /usr/local directory (closes #252)
• amd64: use a silly workaround to avoid possible GCC 4.6 bug (going to report to GCC's bugzilla)
• toolchain.sh now supports parallel toolchain build (i.e. all targets at once)
• improve linker scripts to support the newest compiler input sections
• remove unused variables and other various fixes for GCC 4.6 warnings (GCC 4.5.1 also passes compilation)
• unification of kernel memcpy() and memstr() functions (use compiler builtins whenever possible, keep plain C fallback implementations in a sepearate object file)

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;
 }