Signed-off-by: Kevin O'Connor kevin@koconnor.net --- vgasrc/bochsvga.c | 123 +++++++++++++++++++++++++++-------------------------- 1 files changed, 62 insertions(+), 61 deletions(-)
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c index 70ac449..6652c2e 100644 --- a/vgasrc/bochsvga.c +++ b/vgasrc/bochsvga.c @@ -9,73 +9,74 @@ static struct mode { u16 mode; + u8 memmodel; u16 width; u16 height; u8 depth; } bochsvga_modes[] VAR16 = { /* standard modes */ - { 0x100, 640, 400, 8 }, - { 0x101, 640, 480, 8 }, - { 0x102, 800, 600, 4 }, - { 0x103, 800, 600, 8 }, - { 0x104, 1024, 768, 4 }, - { 0x105, 1024, 768, 8 }, - { 0x106, 1280, 1024, 4 }, - { 0x107, 1280, 1024, 8 }, - { 0x10D, 320, 200, 15 }, - { 0x10E, 320, 200, 16 }, - { 0x10F, 320, 200, 24 }, - { 0x110, 640, 480, 15 }, - { 0x111, 640, 480, 16 }, - { 0x112, 640, 480, 24 }, - { 0x113, 800, 600, 15 }, - { 0x114, 800, 600, 16 }, - { 0x115, 800, 600, 24 }, - { 0x116, 1024, 768, 15 }, - { 0x117, 1024, 768, 16 }, - { 0x118, 1024, 768, 24 }, - { 0x119, 1280, 1024, 15 }, - { 0x11A, 1280, 1024, 16 }, - { 0x11B, 1280, 1024, 24 }, - { 0x11C, 1600, 1200, 8 }, - { 0x11D, 1600, 1200, 15 }, - { 0x11E, 1600, 1200, 16 }, - { 0x11F, 1600, 1200, 24 }, + { 0x100, MM_PACKED, 640, 400, 8 }, + { 0x101, MM_PACKED, 640, 480, 8 }, + { 0x102, MM_PLANAR, 800, 600, 4 }, + { 0x103, MM_PACKED, 800, 600, 8 }, + { 0x104, MM_PLANAR, 1024, 768, 4 }, + { 0x105, MM_PACKED, 1024, 768, 8 }, + { 0x106, MM_PLANAR, 1280, 1024, 4 }, + { 0x107, MM_PACKED, 1280, 1024, 8 }, + { 0x10D, MM_DIRECT, 320, 200, 15 }, + { 0x10E, MM_DIRECT, 320, 200, 16 }, + { 0x10F, MM_DIRECT, 320, 200, 24 }, + { 0x110, MM_DIRECT, 640, 480, 15 }, + { 0x111, MM_DIRECT, 640, 480, 16 }, + { 0x112, MM_DIRECT, 640, 480, 24 }, + { 0x113, MM_DIRECT, 800, 600, 15 }, + { 0x114, MM_DIRECT, 800, 600, 16 }, + { 0x115, MM_DIRECT, 800, 600, 24 }, + { 0x116, MM_DIRECT, 1024, 768, 15 }, + { 0x117, MM_DIRECT, 1024, 768, 16 }, + { 0x118, MM_DIRECT, 1024, 768, 24 }, + { 0x119, MM_DIRECT, 1280, 1024, 15 }, + { 0x11A, MM_DIRECT, 1280, 1024, 16 }, + { 0x11B, MM_DIRECT, 1280, 1024, 24 }, + { 0x11C, MM_PACKED, 1600, 1200, 8 }, + { 0x11D, MM_DIRECT, 1600, 1200, 15 }, + { 0x11E, MM_DIRECT, 1600, 1200, 16 }, + { 0x11F, MM_DIRECT, 1600, 1200, 24 }, /* BOCHS modes */ - { 0x140, 320, 200, 32 }, - { 0x141, 640, 400, 32 }, - { 0x142, 640, 480, 32 }, - { 0x143, 800, 600, 32 }, - { 0x144, 1024, 768, 32 }, - { 0x145, 1280, 1024, 32 }, - { 0x146, 320, 200, 8 }, - { 0x147, 1600, 1200, 32 }, - { 0x148, 1152, 864, 8 }, - { 0x149, 1152, 864, 15 }, - { 0x14a, 1152, 864, 16 }, - { 0x14b, 1152, 864, 24 }, - { 0x14c, 1152, 864, 32 }, - { 0x178, 1280, 800, 16 }, - { 0x179, 1280, 800, 24 }, - { 0x17a, 1280, 800, 32 }, - { 0x17b, 1280, 960, 16 }, - { 0x17c, 1280, 960, 24 }, - { 0x17d, 1280, 960, 32 }, - { 0x17e, 1440, 900, 16 }, - { 0x17f, 1440, 900, 24 }, - { 0x180, 1440, 900, 32 }, - { 0x181, 1400, 1050, 16 }, - { 0x182, 1400, 1050, 24 }, - { 0x183, 1400, 1050, 32 }, - { 0x184, 1680, 1050, 16 }, - { 0x185, 1680, 1050, 24 }, - { 0x186, 1680, 1050, 32 }, - { 0x187, 1920, 1200, 16 }, - { 0x188, 1920, 1200, 24 }, - { 0x189, 1920, 1200, 32 }, - { 0x18a, 2560, 1600, 16 }, - { 0x18b, 2560, 1600, 24 }, - { 0x18c, 2560, 1600, 32 }, + { 0x140, MM_DIRECT, 320, 200, 32 }, + { 0x141, MM_DIRECT, 640, 400, 32 }, + { 0x142, MM_DIRECT, 640, 480, 32 }, + { 0x143, MM_DIRECT, 800, 600, 32 }, + { 0x144, MM_DIRECT, 1024, 768, 32 }, + { 0x145, MM_DIRECT, 1280, 1024, 32 }, + { 0x146, MM_PACKED, 320, 200, 8 }, + { 0x147, MM_DIRECT, 1600, 1200, 32 }, + { 0x148, MM_PACKED, 1152, 864, 8 }, + { 0x149, MM_DIRECT, 1152, 864, 15 }, + { 0x14a, MM_DIRECT, 1152, 864, 16 }, + { 0x14b, MM_DIRECT, 1152, 864, 24 }, + { 0x14c, MM_DIRECT, 1152, 864, 32 }, + { 0x178, MM_DIRECT, 1280, 800, 16 }, + { 0x179, MM_DIRECT, 1280, 800, 24 }, + { 0x17a, MM_DIRECT, 1280, 800, 32 }, + { 0x17b, MM_DIRECT, 1280, 960, 16 }, + { 0x17c, MM_DIRECT, 1280, 960, 24 }, + { 0x17d, MM_DIRECT, 1280, 960, 32 }, + { 0x17e, MM_DIRECT, 1440, 900, 16 }, + { 0x17f, MM_DIRECT, 1440, 900, 24 }, + { 0x180, MM_DIRECT, 1440, 900, 32 }, + { 0x181, MM_DIRECT, 1400, 1050, 16 }, + { 0x182, MM_DIRECT, 1400, 1050, 24 }, + { 0x183, MM_DIRECT, 1400, 1050, 32 }, + { 0x184, MM_DIRECT, 1680, 1050, 16 }, + { 0x185, MM_DIRECT, 1680, 1050, 24 }, + { 0x186, MM_DIRECT, 1680, 1050, 32 }, + { 0x187, MM_DIRECT, 1920, 1200, 16 }, + { 0x188, MM_DIRECT, 1920, 1200, 24 }, + { 0x189, MM_DIRECT, 1920, 1200, 32 }, + { 0x18a, MM_DIRECT, 2560, 1600, 16 }, + { 0x18b, MM_DIRECT, 2560, 1600, 24 }, + { 0x18c, MM_DIRECT, 2560, 1600, 32 }, { 0, }, };