666c666
< regNum = MISCREG_APIC_ID;
---
> regNum = APIC_ID;
669c669
< regNum = MISCREG_APIC_VERSION;
---
> regNum = APIC_VERSION;
672c672
< regNum = MISCREG_APIC_TASK_PRIORITY;
---
> regNum = APIC_TASK_PRIORITY;
675c675
< regNum = MISCREG_APIC_ARBITRATION_PRIORITY;
---
> regNum = APIC_ARBITRATION_PRIORITY;
678c678
< regNum = MISCREG_APIC_PROCESSOR_PRIORITY;
---
> regNum = APIC_PROCESSOR_PRIORITY;
681c681
< regNum = MISCREG_APIC_EOI;
---
> regNum = APIC_EOI;
684c684
< regNum = MISCREG_APIC_LOGICAL_DESTINATION;
---
> regNum = APIC_LOGICAL_DESTINATION;
687c687
< regNum = MISCREG_APIC_DESTINATION_FORMAT;
---
> regNum = APIC_DESTINATION_FORMAT;
690c690
< regNum = MISCREG_APIC_SPURIOUS_INTERRUPT_VECTOR;
---
> regNum = APIC_SPURIOUS_INTERRUPT_VECTOR;
708,709c708
< regNum = MISCREG_APIC_IN_SERVICE(
< (paddr - baseAddr - 0x100) / 0x8);
---
> regNum = APIC_IN_SERVICE((paddr - baseAddr - 0x100) / 0x8);
727,728c726
< regNum = MISCREG_APIC_TRIGGER_MODE(
< (paddr - baseAddr - 0x180) / 0x8);
---
> regNum = APIC_TRIGGER_MODE((paddr - baseAddr - 0x180) / 0x8);
746,747c744
< regNum = MISCREG_APIC_INTERRUPT_REQUEST(
< (paddr - baseAddr - 0x200) / 0x8);
---
> regNum = APIC_INTERRUPT_REQUEST((paddr - baseAddr - 0x200) / 0x8);
750c747
< regNum = MISCREG_APIC_ERROR_STATUS;
---
> regNum = APIC_ERROR_STATUS;
753c750
< regNum = MISCREG_APIC_INTERRUPT_COMMAND_LOW;
---
> regNum = APIC_INTERRUPT_COMMAND_LOW;
756c753
< regNum = MISCREG_APIC_INTERRUPT_COMMAND_HIGH;
---
> regNum = APIC_INTERRUPT_COMMAND_HIGH;
759c756
< regNum = MISCREG_APIC_LVT_TIMER;
---
> regNum = APIC_LVT_TIMER;
762c759
< regNum = MISCREG_APIC_LVT_THERMAL_SENSOR;
---
> regNum = APIC_LVT_THERMAL_SENSOR;
765c762
< regNum = MISCREG_APIC_LVT_PERFORMANCE_MONITORING_COUNTERS;
---
> regNum = APIC_LVT_PERFORMANCE_MONITORING_COUNTERS;
768c765
< regNum = MISCREG_APIC_LVT_LINT0;
---
> regNum = APIC_LVT_LINT0;
771c768
< regNum = MISCREG_APIC_LVT_LINT1;
---
> regNum = APIC_LVT_LINT1;
774c771
< regNum = MISCREG_APIC_LVT_ERROR;
---
> regNum = APIC_LVT_ERROR;
777c774
< regNum = MISCREG_APIC_INITIAL_COUNT;
---
> regNum = APIC_INITIAL_COUNT;
780c777
< regNum = MISCREG_APIC_CURRENT_COUNT;
---
> regNum = APIC_CURRENT_COUNT;
783c780
< regNum = MISCREG_APIC_DIVIDE_CONFIGURATION;
---
> regNum = APIC_DIVIDE_CONFIGURATION;
789a787
> regNum += MISCREG_APIC_START;