Changeset 202 for trunk

Timestamp:

Jul 13, 2017, 2:09:32 PM (7 years ago)

Author:

max@…

Message:

register the ATA IRQs

Location:

trunk/hal/x86_64/core

Files:

• hal_apic.c (modified) (1 diff)
• hal_apic.h (modified) (1 diff)
• hal_init.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_apic.c

@@ -237 +237 @@
 vaddr_t ioapic_va __in_kdata = 0;
 
-#define IRQ_TIMER       0x00
-#define IRQ_KEYBOARD    0x01
-#define IRQ_COM2        0x03
-#define IRQ_COM1        0x04
-#define IRQ_FLOPPY      0x06
-#define IRQ_ATA0        0x0e
-#define IRQ_ATA1        0x0f
-
 #define IOREGSEL        0x00
 #define IOWIN   0x10

trunk/hal/x86_64/core/hal_apic.h

@@ -177 +177 @@
 #       define LAPIC_DCRT_DIV128        0x0a
 
+/*
+ *******************************************************************************
+ * IRQ numbers
+ *******************************************************************************
+ */
+
+#define IRQ_TIMER       0
+#define IRQ_KEYBOARD    1
+#define IRQ_COM2        3
+#define IRQ_COM1        4
+#define IRQ_FLOPPY      6
+#define IRQ_ATA0        14
+#define IRQ_ATA1        15
+

trunk/hal/x86_64/core/hal_init.c

@@ -172 +172 @@
         dev->param3 = 0;
 
-        dev->irqs = 5;
+        dev->irqs = 16;
 
         /* COM1 */
-        dev->irq[4].dev_type = (DEV_FUNC_TXT << 16) | IMPL_TXT_TTY;
-        dev->irq[4].channel = 0;
-        dev->irq[4].is_rx = 0;
-        dev->irq[4].valid = 1;
+        dev->irq[IRQ_COM1].dev_type = (DEV_FUNC_TXT << 16) | IMPL_TXT_TTY;
+        dev->irq[IRQ_COM1].channel = 0;
+        dev->irq[IRQ_COM1].is_rx = 0;
+        dev->irq[IRQ_COM1].valid = 1;
+
+        /* ATA */
+        dev->irq[IRQ_ATA0].dev_type = (DEV_FUNC_IOC << 16) | IMPL_IOC_BDV;
+        dev->irq[IRQ_ATA0].channel = 0;
+        dev->irq[IRQ_ATA0].is_rx = 0;
+        dev->irq[IRQ_ATA0].valid = 1;
 }