Changeset 7f1c620 in mainline for arch/amd64/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/amd64/src/pm.c (modified) (7 diffs)

arch/amd64/src/pm.c

@@ -124 +124 @@
 idescriptor_t idt[IDT_ITEMS];
 
-ptr_16_64_t gdtr = {.limit = sizeof(gdt), .base= (__u64) gdt };
-ptr_16_64_t idtr = {.limit = sizeof(idt), .base= (__u64) idt };
+ptr_16_64_t gdtr = {.limit = sizeof(gdt), .base= (uint64_t) gdt };
+ptr_16_64_t idtr = {.limit = sizeof(idt), .base= (uint64_t) idt };
 
 static tss_t tss;
 tss_t *tss_p = NULL;
 
-void gdt_tss_setbase(descriptor_t *d, __address base)
+void gdt_tss_setbase(descriptor_t *d, uintptr_t base)
 {
         tss_descriptor_t *td = (tss_descriptor_t *) d;
@@ -140 +140 @@
 }
 
-void gdt_tss_setlimit(descriptor_t *d, __u32 limit)
+void gdt_tss_setlimit(descriptor_t *d, uint32_t limit)
 {
         struct tss_descriptor *td = (tss_descriptor_t *) d;
@@ -148 +148 @@
 }
 
-void idt_setoffset(idescriptor_t *d, __address offset)
+void idt_setoffset(idescriptor_t *d, uintptr_t offset)
 {
         /*
@@ -160 +160 @@
 void tss_initialize(tss_t *t)
 {
-        memsetb((__address) t, sizeof(tss_t), 0);
+        memsetb((uintptr_t) t, sizeof(tss_t), 0);
 }
 
@@ -180 +180 @@
                 d->type = AR_INTERRUPT; /* masking interrupt */
 
-                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);
         }
@@ -215 +215 @@
                  * non boot-mapped pointer, initialize the CR3 register
                  * ahead of page_init */
-                write_cr3((__address) AS_KERNEL->page_table);
+                write_cr3((uintptr_t) AS_KERNEL->page_table);
 
                 tss_p = (struct tss *) malloc(sizeof(tss_t), FRAME_ATOMIC);
@@ -229 +229 @@
         tss_desc->dpl = PL_KERNEL;
         
-        gdt_tss_setbase(&gdt_p[TSS_DES], (__address) tss_p);
+        gdt_tss_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p);
         gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1);