Changeset 7f1c620 in mainline for arch/ia32/src/pm.c

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• arch/ia32/src/pm.c (modified) (8 diffs)

arch/ia32/src/pm.c

@@ -87 +87 @@
 
 /* gdtr is changed by kmp before next CPU is initialized */
-ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
-ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (__address) gdt };
-
-void gdt_setbase(descriptor_t *d, __address base)
+ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((uintptr_t) gdt) };
+ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (uintptr_t) gdt };
+
+void gdt_setbase(descriptor_t *d, uintptr_t base)
 {
         d->base_0_15 = base & 0xffff;
@@ -97 +97 @@
 }
 
-void gdt_setlimit(descriptor_t *d, __u32 limit)
+void gdt_setlimit(descriptor_t *d, uint32_t limit)
 {
         d->limit_0_15 = limit & 0xffff;
@@ -103 +103 @@
 }
 
-void idt_setoffset(idescriptor_t *d, __address offset)
+void idt_setoffset(idescriptor_t *d, uintptr_t offset)
 {
         /*
@@ -114 +114 @@
 void tss_initialize(tss_t *t)
 {
-        memsetb((__address) t, sizeof(struct tss), 0);
+        memsetb((uintptr_t) t, sizeof(struct tss), 0);
 }
 
@@ -140 +140 @@
                 }
                 
-                idt_setoffset(d, ((__address) interrupt_handlers) + i*interrupt_handler_size);
+                idt_setoffset(d, ((uintptr_t) interrupt_handlers) + i*interrupt_handler_size);
                 exc_register(i, "undef", (iroutine) null_interrupt);
         }
@@ -183 +183 @@
          */
         idtr.limit = sizeof(idt);
-        idtr.base = (__address) idt;
+        idtr.base = (uintptr_t) idt;
         gdtr_load(&gdtr);
         idtr_load(&idtr);
@@ -212 +212 @@
         gdt_p[TSS_DES].granularity = 0;
         
-        gdt_setbase(&gdt_p[TSS_DES], (__address) tss_p);
+        gdt_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p);
         gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1);
 
@@ -225 +225 @@
 }
 
-void set_tls_desc(__address tls)
+void set_tls_desc(uintptr_t tls)
 {
         ptr_16_32_t cpugdtr;