Changeset 9149135 in mainline for arch/ia32/include/smp/apic.h

Timestamp:

2005-11-24T18:43:46Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

78c32b4

Parents:

f701b236

Message:

SMP cleanup continued.
Add nice type for IO APIC ID register.
Replace some magic numbers with more descriptive macros.

File:

• arch/ia32/include/smp/apic.h (modified) (5 diffs)

arch/ia32/include/smp/apic.h

@@ -36 +36 @@
 #define LOPRI           (1<<0)
 
+#define APIC_ID_COUNT   16
+
 /* local APIC macros */
 #define IPI_INIT        0
@@ -86 +88 @@
 #define TIMER_PERIODIC  0x1
 
-#define SEND_PENDING    (1<<12)
+/** Delivery status. */
+#define DELIVS_IDLE     0x0
+#define DELIVS_PENDING  0x1
+
+/** Destination masks. */
+#define DEST_ALL        0xff
 
 /** Interrupt Command Register. */
@@ -225 +232 @@
 /** Local APIC ID Register. */
 #define L_APIC_ID       (0x020/sizeof(__u32))
-union lapic_id {
+union l_apic_id {
         __u32 value;
         struct {
@@ -232 +239 @@
         } __attribute__ ((packed));
 };
-typedef union lapic_id lapic_id_t;
+typedef union l_apic_id l_apic_id_t;
 
 /* Local APIC Version Register */
@@ -285 +292 @@
         
 } __attribute__ ((packed));
-
 typedef struct io_redirection_reg io_redirection_reg_t;
+
+
+/** IO APIC Identification Register. */
+union io_apic_id {
+        __u32 value;
+        struct {
+                unsigned : 24;          /**< Reserved. */
+                unsigned apic_id : 4;   /**< IO APIC ID. */
+                unsigned : 4;           /**< Reserved. */
+        } __attribute__ ((packed));
+};
+typedef union io_apic_id io_apic_id_t;
 
 extern volatile __u32 *l_apic;