Changeset 7f1c620 in mainline for arch/ia32/src/smp/mps.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/smp/mps.c (modified) (13 diffs)

arch/ia32/src/smp/mps.c

@@ -56 +56 @@
 #define CT_SIGNATURE    0x504d4350
 
-int mps_fs_check(__u8 *base);
+int mps_fs_check(uint8_t *base);
 int mps_ct_check(void);
 
 int configure_via_ct(void);
-int configure_via_default(__u8 n);
+int configure_via_default(uint8_t n);
 
 int ct_processor_entry(struct __processor_entry *pr);
@@ -93 +93 @@
 static bool is_cpu_enabled(index_t i);
 static bool is_bsp(index_t i);
-static __u8 get_cpu_apic_id(index_t i);
+static uint8_t get_cpu_apic_id(index_t i);
 static int mps_irq_to_pin(int irq);
 
@@ -121 +121 @@
 }
 
-__u8 get_cpu_apic_id(index_t i)
+uint8_t get_cpu_apic_id(index_t i)
 {
         ASSERT(i < processor_entry_cnt);
@@ -131 +131 @@
  * Used to check the integrity of the MP Floating Structure.
  */
-int mps_fs_check(__u8 *base)
+int mps_fs_check(uint8_t *base)
 {
         int i;
-        __u8 sum;
+        uint8_t sum;
         
         for (i = 0, sum = 0; i < 16; i++)
@@ -147 +147 @@
 int mps_ct_check(void)
 {
-        __u8 *base = (__u8 *) ct;
-        __u8 *ext = base + ct->base_table_length;
-        __u8 sum;
+        uint8_t *base = (uint8_t *) ct;
+        uint8_t *ext = base + ct->base_table_length;
+        uint8_t sum;
         int i;  
         
@@ -168 +168 @@
 void mps_init(void)
 {
-        __u8 *addr[2] = { NULL, (__u8 *) PA2KA(0xf0000) };
+        uint8_t *addr[2] = { NULL, (uint8_t *) PA2KA(0xf0000) };
         int i, j, length[2] = { 1024, 64*1024 };
         
@@ -179 +179 @@
          */
 
-        addr[0] = (__u8 *) PA2KA(ebda ? ebda : 639 * 1024);
+        addr[0] = (uint8_t *) PA2KA(ebda ? ebda : 639 * 1024);
         for (i = 0; i < 2; i++) {
                 for (j = 0; j < length[i]; j += 16) {
-                        if (*((__u32 *) &addr[i][j]) == FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
+                        if (*((uint32_t *) &addr[i][j]) == FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
                                 fs = (struct mps_fs *) &addr[i][j];
                                 goto fs_found;
@@ -200 +200 @@
                 }
 
-                ct = (struct mps_ct *)PA2KA((__address)fs->configuration_table);
+                ct = (struct mps_ct *)PA2KA((uintptr_t)fs->configuration_table);
                 config.cpu_count = configure_via_ct();
         } 
@@ -211 +211 @@
 int configure_via_ct(void)
 {
-        __u8 *cur;
+        uint8_t *cur;
         int i, cnt;
                 
@@ -227 +227 @@
         }
         
-        l_apic = (__u32 *)(__address)ct->l_apic;
+        l_apic = (uint32_t *)(uintptr_t)ct->l_apic;
 
         cnt = 0;
@@ -290 +290 @@
 }
 
-int configure_via_default(__u8 n)
+int configure_via_default(uint8_t n)
 {
         /*
@@ -337 +337 @@
         }
         
-        io_apic = (__u32 *)(__address)ioa->io_apic;
+        io_apic = (uint32_t *)(uintptr_t)ioa->io_apic;
 }
 
@@ -405 +405 @@
 void ct_extended_entries(void)
 {
-        __u8 *ext = (__u8 *) ct + ct->base_table_length;
-        __u8 *cur;
+        uint8_t *ext = (uint8_t *) ct + ct->base_table_length;
+        uint8_t *cur;
 
         for (cur = ext; cur < ext + ct->ext_table_length; cur += cur[CT_EXT_ENTRY_LEN]) {