diff --git a/base/include/platform/vea9x4/drivers/board_base.h b/base/include/platform/vea9x4/drivers/board_base.h index 3d32a562e..62162c175 100644 --- a/base/include/platform/vea9x4/drivers/board_base.h +++ b/base/include/platform/vea9x4/drivers/board_base.h @@ -45,7 +45,10 @@ namespace Genode PL011_0_MMIO_BASE = MMIO_0_BASE + 0x9000, PL011_0_MMIO_SIZE = 0x1000, PL011_0_CLOCK = 24*1000*1000, - PL011_0_IRQ = 5, + PL011_0_IRQ = 37, + PL011_1_IRQ = 38, + PL011_2_IRQ = 39, + PL011_3_IRQ = 40, /* timer/counter */ SP804_0_1_MMIO_BASE = MMIO_0_BASE + 0x11000, @@ -53,6 +56,17 @@ namespace Genode SP804_0_1_CLOCK = 1000*1000, SP804_0_1_IRQ = 34, + /* PS2 */ + KMI_0_IRQ = 44, + KMI_1_IRQ = 45, + + /* LAN */ + LAN9118_IRQ = 47, + + /* card reader */ + PL180_0_IRQ = 9, + PL180_1_IRQ = 10, + /* clocks */ TCREF_CLOCK = 66670*1000, diff --git a/os/include/platform/vea9x4/lan9118_defs.h b/os/include/platform/vea9x4/lan9118_defs.h index 60a881a82..16b057378 100644 --- a/os/include/platform/vea9x4/lan9118_defs.h +++ b/os/include/platform/vea9x4/lan9118_defs.h @@ -16,6 +16,7 @@ #define _INCLUDE__PLATFORM__VEA9X4__LAN9118_DEFS_H_ #include +#include enum { @@ -35,7 +36,7 @@ enum { /** * Interrupt line */ - LAN9118_IRQ = 32 + 15, + LAN9118_IRQ = Genode::Board_base::LAN9118_IRQ, }; #endif /* _INCLUDE__PLATFORM__VEA9X4__LAN9118_DEFS_H_ */ diff --git a/os/include/platform/vea9x4/pl011_defs.h b/os/include/platform/vea9x4/pl011_defs.h index d0f7f10a7..195e08917 100644 --- a/os/include/platform/vea9x4/pl011_defs.h +++ b/os/include/platform/vea9x4/pl011_defs.h @@ -16,6 +16,7 @@ #define _INCLUDE__PLATFORM__PBXA9__PL011_DEFS_H_ #include +#include enum { @@ -34,10 +35,10 @@ enum { /** * Interrupt lines */ - PL011_IRQ0 = 32 + 5, /* UART 0 */ - PL011_IRQ1 = 32 + 6, /* UART 1 */ - PL011_IRQ2 = 32 + 7, /* UART 2 */ - PL011_IRQ3 = 32 + 8, /* UART 3 */ + PL011_IRQ0 = Genode::Board_base::PL011_0_IRQ, /* UART 0 */ + PL011_IRQ1 = Genode::Board_base::PL011_1_IRQ, /* UART 1 */ + PL011_IRQ2 = Genode::Board_base::PL011_2_IRQ, /* UART 2 */ + PL011_IRQ3 = Genode::Board_base::PL011_3_IRQ, /* UART 3 */ /** * UART baud rate configuration (precalculated) diff --git a/os/include/platform/vea9x4/pl050_defs.h b/os/include/platform/vea9x4/pl050_defs.h index 0c65d86d4..281790456 100644 --- a/os/include/platform/vea9x4/pl050_defs.h +++ b/os/include/platform/vea9x4/pl050_defs.h @@ -16,6 +16,7 @@ #define _INCLUDE__PLATFORM__PBXA9__PL050_DEFS_H_ #include +#include enum { PL050_KEYBD_PHYS = SMB_CS7 + 0x6000, PL050_KEYBD_SIZE = 0x1000, @@ -24,8 +25,8 @@ enum { /** * Interrupt lines */ - PL050_KEYBD_IRQ = 32 + 12, - PL050_MOUSE_IRQ = 32 + 13, + PL050_KEYBD_IRQ = Genode::Board_base::KMI_0_IRQ, + PL050_MOUSE_IRQ = Genode::Board_base::KMI_1_IRQ, }; #endif /* _INCLUDE__PLATFORM__PBXA9__PL050_DEFS_H_ */ diff --git a/os/include/platform/vea9x4/pl180_defs.h b/os/include/platform/vea9x4/pl180_defs.h index 5ceb35fb2..db148d2f8 100644 --- a/os/include/platform/vea9x4/pl180_defs.h +++ b/os/include/platform/vea9x4/pl180_defs.h @@ -16,6 +16,7 @@ #define _INCLUDE__PLATFORM__PBXA9__PL180_DEFS_H_ #include +#include enum { PL180_PHYS = SMB_CS7 + 0x5000, PL180_SIZE = 0x1000, @@ -23,8 +24,8 @@ enum { /** * Interrupt lines */ - PL180_IRQ0 = 9, - PL180_IRQ1 = 10, + PL180_IRQ0 = Genode::Board_base::PL180_0_IRQ, + PL180_IRQ1 = Genode::Board_base::PL180_1_IRQ, }; #endif /* _INCLUDE__PLATFORM__PBXA9__PL180_DEFS_H_ */