#include <devices/8259a.h>
#include <devices/8254.h>
#include <devices/keyboard.h>
+#include <devices/serial.h>
#include <palacios/vmm_intr.h>
#include <palacios/vmm_dev_mgr.h>
struct vm_device * pic = create_pic();
struct vm_device * keyboard = create_keyboard();
struct vm_device * pit = create_pit();
+ struct vm_device * serial = create_serial();
#define GENERIC 1
#if GENERIC
generic_port_range_type range[] = {
+#if 0
+ {0x00, 0x07, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channels 0,1,2,3 (address, counter)
+ {0xc0, 0xc7, GENERIC_PRINT_AND_
+IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter)
+ {0x87, 0x87, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 0 page register
+ {0x83, 0x83, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 1 page register
+ {0x81, 0x81, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 2 page register
+ {0x82, 0x82, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 3 page register
+ {0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 4 page register
+ {0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 5 page register
+ {0x89, 0x89, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 6 page register
+ {0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 7 page register
+ {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE}, // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
+ {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE}, // DMA 2 misc registers
+#endif
+
/*
- {0x00, 0x07, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channels 0,1,2,3 (address, counter)
- {0xc0, 0xc7, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channels 4,5,6,7 (address, counter)
- {0x87, 0x87, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 0 page register
- {0x83, 0x83, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 1 page register
- {0x81, 0x81, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 2 page register
- {0x82, 0x82, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 3 page register
- {0x8f, 0x8f, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 4 page register
- {0x8b, 0x8b, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 5 page register
- {0x89, 0x89, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 6 page register
- {0x8a, 0x8a, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 7 page register
- {0x08, 0x0f, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
- {0xd0, 0xde, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 misc registers
+ {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 1
+ {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2
+ {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2
+ {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2
*/
- {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE},
- {0x81, 0x8F, GENERIC_PRINT_AND_IGNORE},
- {0xd0, 0xdf, GENERIC_PRINT_AND_IGNORE},
-
-
- {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 1
- {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2
- {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2
- {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2
/*
{0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
{0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
};
- struct vm_device * generic = create_generic(range,13, // THIS NUMBER IS CRITICAL
+ struct vm_device * generic = create_generic(range,6, // THIS NUMBER IS CRITICAL
NULL,0,NULL,0);
-
#endif
attach_device(&(vm_info), nvram);
attach_device(&(vm_info), pic);
attach_device(&(vm_info), pit);
attach_device(&(vm_info), keyboard);
+ attach_device(&(vm_info), serial);
#if GENERIC
#if 0
// give floppy controller to vm
hook_irq(&vm_info, 6);
-
+#endif
//primary ide
hook_irq(&vm_info, 14);
// secondary ide
hook_irq(&vm_info, 15);
-#endif
+
vm_info.rip = 0xfff0;
vm_info.vm_regs.rsp = 0x0;