Changeset 9c0a9b3 in mainline for arch/ia32/src

Timestamp:

2005-08-30T19:44:27Z (20 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

d0c30f7

Parents:

8fc0d455

Message:

1) memcopy and _memcopy functions rewriten to ANSI C norm.
2) Repaired ia32,ia64 and mips version of SPARTAN to work with this memcopy functions
3) Warning for non declared funcions added and repaired ia32,ia64 and mips versions to pass build process with this warning and Werror option

Location:

arch/ia32/src

Files:

• acpi/acpi.c (modified) (1 diff)
• acpi/madt.c (modified) (1 diff)
• drivers/ega.c (modified) (2 diffs)
• drivers/i8254.c (modified) (1 diff)
• drivers/i8259.c (modified) (1 diff)
• ia32.c (modified) (1 diff)
• mm/memory_init.c (modified) (1 diff)
• mm/page.c (modified) (2 diffs)
• pm.c (modified) (1 diff)
• smp/mps.c (modified) (1 diff)
• smp/smp.c (modified) (2 diffs)

arch/ia32/src/acpi/acpi.c

@@ -32 +32 @@
 
 #include <mm/page.h>
+#include <print.h>
 
 #define RSDP_SIGNATURE          "RSD PTR "

arch/ia32/src/acpi/madt.c

@@ -36 +36 @@
 #include <debug.h>
 #include <config.h>
+#include <print.h>
 
 struct acpi_madt *acpi_madt = NULL;

arch/ia32/src/drivers/ega.c

@@ -34 +34 @@
 #include <arch/types.h>
 #include <arch/asm.h>
+#include <memstr.h>
 
 /*
@@ -73 +74 @@
                 return;
 
-        memcopy(PA2KA(VIDEORAM) + ROW*2, PA2KA(VIDEORAM), (SCREEN - ROW)*2);
+        memcopy((void *)PA2KA(VIDEORAM),(void *)PA2KA(VIDEORAM) + ROW*2, (SCREEN - ROW)*2); //swaped
         memsetw(PA2KA(VIDEORAM) + (SCREEN - ROW)*2, ROW, 0x0720);
         ega_cursor = ega_cursor - ROW;

arch/ia32/src/drivers/i8254.c

@@ -37 +37 @@
 #include <arch/pm.h>
 #include <arch/asm.h>
+#include <arch/cpuid.h>
 #include <arch.h>
+#include <time/delay.h>
 
 /*

arch/ia32/src/drivers/i8259.c

@@ -32 +32 @@
 #include <arch/asm.h>
 #include <arch.h>
+#include <print.h>
 
 /*

arch/ia32/src/ia32.c

@@ -46 +46 @@
 #include <arch/asm.h>
 #include <arch/acpi/acpi.h>
+
+#include <arch/bios/bios.h>
+
 #include <arch/mm/memory_init.h>
+
 
 void arch_pre_mm_init(void)

arch/ia32/src/mm/memory_init.c

@@ -29 +29 @@
 #include <arch/boot/memmap.h>
 #include <arch/mm/memory_init.h>
+#include <print.h>
 
 size_t get_memory_size(void) 

arch/ia32/src/mm/page.c

@@ -37 +37 @@
 #include <synch/spinlock.h>
 #include <debug.h>
+#include <memstr.h>
 
 __address bootstrap_dba; 
@@ -72 +73 @@
 
                 dba = frame_alloc(FRAME_KA | FRAME_PANIC);
-                memcopy(bootstrap_dba, dba, PAGE_SIZE);
+                memcopy((void *)dba,(void *)bootstrap_dba , PAGE_SIZE); //swaped
                 write_cr3(KA2PA(dba));
         }

arch/ia32/src/pm.c

@@ -36 +36 @@
 #include <panic.h>
 #include <arch/mm/page.h>
+#include <mm/heap.h>
+#include <memstr.h>
 
 /*

arch/ia32/src/smp/mps.c

@@ -41 +41 @@
 #include <arch/asm.h>
 #include <arch/bios/bios.h>
+#include <mm/frame.h>
 
 /*

arch/ia32/src/smp/smp.c

@@ -43 +43 @@
 #include <mm/page.h>
 #include <mm/heap.h>
+#include <print.h>
+#include <memstr.h>
+#include <arch/i8259.h>
 
 #ifdef __SMP__
@@ -137 +140 @@
                         panic("couldn't allocate memory for GDT\n");
 
-                memcopy(gdt, gdt_new, GDT_ITEMS*sizeof(struct descriptor));
-                memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
+                memcopy(gdt_new, gdt, GDT_ITEMS*sizeof(struct descriptor));           // swaped
+                memsetb((__address)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
                 gdtr.base = KA2PA((__address) gdt_new);