Changeset 3abfe9a8 in mainline for kernel/genarch/src

Timestamp:

2011-03-29T21:38:40Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d6b81941

Parents:

ebebd38 (diff), eaf4c393 (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:

separate memset/memcpy redirection to builtin functions and fallback C implementations

Location:

kernel/genarch/src

Files:

• drivers/via-cuda/cuda.c (modified) (2 diffs)
• ofw/ebus.c (modified) (1 diff)
• ofw/fhc.c (modified) (1 diff)
• ofw/ofw_tree.c (modified) (1 diff)
• ofw/pci.c (modified) (1 diff)
• ofw/upa.c (modified) (1 diff)

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

kernel/genarch/src/ofw/ebus.c

@@ -39 +39 @@
 #include <genarch/ofw/ebus.h>
 #include <genarch/ofw/pci.h>
-#include <arch/memstr.h>
 #include <str.h>
 #include <panic.h>

kernel/genarch/src/ofw/fhc.c

@@ -39 +39 @@
 #include <genarch/ofw/fhc.h>
 #include <arch/drivers/fhc.h>
-#include <arch/memstr.h>
 #include <str.h>
 #include <panic.h>

kernel/genarch/src/ofw/ofw_tree.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <arch/memstr.h>
 #include <mm/slab.h>
+#include <memstr.h>
 #include <str.h>
 #include <panic.h>

kernel/genarch/src/ofw/pci.c

@@ -40 +40 @@
 #include <arch/drivers/pci.h>
 #include <arch/trap/interrupt.h>
-#include <arch/memstr.h>
 #include <str.h>
 #include <panic.h>

kernel/genarch/src/ofw/upa.c

@@ -38 +38 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <genarch/ofw/upa.h>
-#include <arch/memstr.h>
 #include <func.h>
 #include <panic.h>