xnu-1486.2.11.tar.gz

[apple/xnu.git] / osfmk / ppc / bcopytest.c

diff --git a/osfmk/ppc/bcopytest.c b/osfmk/ppc/bcopytest.c
index e27d13eebb17074e29061f02efc11563d3eaae84..bcc86bfb4685d640a5e36dc8bd594daccb349941 100644 (file)
--- a/osfmk/ppc/bcopytest.c
+++ b/osfmk/ppc/bcopytest.c
@@ -1,11 +1,9 @@
-#include <cpus.h>
 #include <debug.h>
 #include <mach_kgdb.h>
 #include <mach_vm_debug.h>
 #include <db_machine_commands.h>
 
 #include <kern/thread.h>
-#include <kern/thread_act.h>
 #include <mach/vm_attributes.h>
 #include <mach/vm_param.h>
 #include <vm/vm_kern.h>
@@ -27,7 +25,7 @@
 #include <ppc/mappings.h>
 #include <ddb/db_output.h>
 
-#include <ppc/POWERMAC/video_console.h>                /* (TEST/DEBUG) */
+#include <console/video_console.h>             /* (TEST/DEBUG) */
 
 #define patper 253
 
@@ -50,24 +48,20 @@ void bcopytest(void);
 void bcopytest(void) {
 
        void *srcptr, *snkptr, *asrc, *asnk;
-       int bsrc, bsnk, size, iterations, i, ret, n; 
-       unsigned int makerand, timein, timeout, ticks;
+       int bsrc, bsnk, size, i, ret, n; 
        volatile int dbg = 0;
        unsigned int *sink, *source;
        
-       long long tottime, totbytes;
-       long long tottime2, totbytes2;
-       
        kern_return_t retr;
        
        db_printf("bcopy test\n");      
        
-       retr = kmem_alloc_wired(kernel_map, (vm_offset_t *)&sink, (1024*1024)+4096);    /* Get sink area */
+       retr = kmem_alloc_kobject(kernel_map, (vm_offset_t *)&sink, (1024*1024)+4096);  /* Get sink area */
        if(retr != KERN_SUCCESS) {      /* Did we find any memory at all? */
                panic("bcopytest: Whoops...  no memory for sink\n");
        }
        
-       retr = kmem_alloc_wired(kernel_map, (vm_offset_t *)&source, (1024*1024)+4096);  /* Get source area */
+       retr = kmem_alloc_kobject(kernel_map, (vm_offset_t *)&source, (1024*1024)+4096);        /* Get source area */
        if(retr != KERN_SUCCESS) {      /* Did we find any memory at all? */
                panic("bcopytest: Whoops...  no memory for source\n");
        }
@@ -453,8 +447,9 @@ void clrarea(unsigned int *source, unsigned int *sink) {
        return;
 }
 
-void clrarea2(unsigned int *source, unsigned int *sink) {
-
+void
+clrarea2(unsigned int *source, __unused unsigned int *sink)
+{
        unsigned int i;
        unsigned char *ss;
        
@@ -560,7 +555,7 @@ int tstcopy4(void *src, void *snk, unsigned int lgn) {
 
 int tstcopy5(void *src, void *snk, unsigned int lgn) {
 
-       unsigned int i, crap;
+       unsigned int i = 0, crap;
        unsigned char ic, ec, oic, pc;
        
        oic = ((unsigned char *)snk)[0];                                /* Original first sink character */
@@ -601,7 +596,7 @@ int tstcopy5(void *src, void *snk, unsigned int lgn) {
 }
 
 int dumbcopy(void *src, void *snk, unsigned int lgn) {
-       int i;
+       unsigned int i;
        char *p = (char *)snk;
        char *q = (char *)src;