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

arch/ia32/src/smp/apic.c

@@ -68 +68 @@
  * always be 32-bit, would use byte oriented instructions.
  */
-volatile __u32 *l_apic = (__u32 *) 0xfee00000;
-volatile __u32 *io_apic = (__u32 *) 0xfec00000;
-
-__u32 apic_id_mask = 0;
+volatile uint32_t *l_apic = (uint32_t *) 0xfee00000;
+volatile uint32_t *io_apic = (uint32_t *) 0xfec00000;
+
+uint32_t apic_id_mask = 0;
 
 static int apic_poll_errors(void);
@@ -219 +219 @@
  * @return 0 on failure, 1 on success.
  */
-int l_apic_broadcast_custom_ipi(__u8 vector)
+int l_apic_broadcast_custom_ipi(uint8_t vector)
 {
         icr_t icr;
@@ -249 +249 @@
  * @return 0 on failure, 1 on success.
  */
-int l_apic_send_init_ipi(__u8 apicid)
+int l_apic_send_init_ipi(uint8_t apicid)
 {
         icr_t icr;
@@ -306 +306 @@
                 for (i = 0; i<2; i++) {
                         icr.lo = l_apic[ICRlo];
-                        icr.vector = ((__address) ap_boot) / 4096; /* calculate the reset vector */
+                        icr.vector = ((uintptr_t) ap_boot) / 4096; /* calculate the reset vector */
                         icr.delmod = DELMOD_STARTUP;
                         icr.destmod = DESTMOD_PHYS;
@@ -332 +332 @@
         ldr_t ldr;
         dfr_t dfr;
-        __u32 t1, t2;
+        uint32_t t1, t2;
 
         /* Initialize LVT Error register. */
@@ -456 +456 @@
  * @return Local APIC ID.
  */
-__u8 l_apic_id(void)
+uint8_t l_apic_id(void)
 {
         l_apic_id_t idreg;
@@ -470 +470 @@
  * @return Content of the addressed IO APIC register.
  */
-__u32 io_apic_read(__u8 address)
+uint32_t io_apic_read(uint8_t address)
 {
         io_regsel_t regsel;
@@ -485 +485 @@
  * @param x Content to be written to the addressed IO APIC register.
  */
-void io_apic_write(__u8 address, __u32 x)
+void io_apic_write(uint8_t address, uint32_t x)
 {
         io_regsel_t regsel;
@@ -502 +502 @@
  * @param flags Flags.
  */
-void io_apic_change_ioredtbl(int pin, int dest, __u8 v, int flags)
+void io_apic_change_ioredtbl(int pin, int dest, uint8_t v, int flags)
 {
         io_redirection_reg_t reg;
@@ -528 +528 @@
  * @param irqmask Bitmask of IRQs to be masked (0 = do not mask, 1 = mask).
  */
-void io_apic_disable_irqs(__u16 irqmask)
+void io_apic_disable_irqs(uint16_t irqmask)
 {
         io_redirection_reg_t reg;
@@ -554 +554 @@
  * @param irqmask Bitmask of IRQs to be unmasked (0 = do not unmask, 1 = unmask).
  */
-void io_apic_enable_irqs(__u16 irqmask)
+void io_apic_enable_irqs(uint16_t irqmask)
 {
         int i, pin;