80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Moved on-board graphics and sound devices to vid_device and snd_device, respectively.

Browse Source
This commit is contained in:
OBattler
2023-10-06 01:19:48 +02:00
parent 3d49b3b036
commit 210f59f8ab
1 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/machine/machine_table.c
View File

@@ -308,10 +308,10 @@ const machine_t machines[] = {
.kbc_device = NULL, /* TODO: No specific kbd_device yet */
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &pcjr_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &pcjr_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1068,10 +1068,10 @@ const machine_t machines[] = {
.kbc_device = &keyboard_xt_olivetti_device,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &m19_vid_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &m19_vid_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1410,10 +1410,10 @@ const machine_t machines[] = {
.kbc_device = &keyboard_tandy_device,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1448,10 +1448,10 @@ const machine_t machines[] = {
.kbc_device = &keyboard_tandy_device,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_device_hx,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_device_hx,
.snd_device = NULL,
.net_device = NULL
},
@@ -1486,10 +1486,10 @@ const machine_t machines[] = {
.kbc_device = &keyboard_xt_t1x00_device,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &t1000_video_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &t1000_video_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1755,10 +1755,10 @@ const machine_t machines[] = {
.kbc_device = &keyboard_xt_zenith_device,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &cga_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &cga_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1871,10 +1871,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_1512_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_1512_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1909,10 +1909,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_1640_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_1640_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1947,10 +1947,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_pc2086_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_pc2086_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -1985,10 +1985,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_pc3086_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_pc3086_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -2023,10 +2023,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_200_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_200_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -2061,10 +2061,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_ppc512_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_ppc512_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -2175,10 +2175,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &ogc_m24_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &ogc_m24_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -2290,10 +2290,10 @@ const machine_t machines[] = {
.kbc_device = NULL /* TODO: No specific kbd_device yet */,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &vid_device_sl,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &vid_device_sl,
.snd_device = NULL,
.net_device = NULL
},
@@ -2328,10 +2328,10 @@ const machine_t machines[] = {
.kbc_device = &keyboard_xt_t1x00_device,
.kbc_p1 = 0xff00,
.gpio = 0xffffffff,
.device = &t1200_video_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &t1200_video_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -2722,10 +2722,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &compaq_plasma_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &compaq_plasma_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -3864,10 +3864,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &tvga8900d_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &tvga8900d_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -4023,10 +4023,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &oti067_ama932j_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &oti067_ama932j_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -4262,10 +4262,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &gd5402_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5402_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -4342,10 +4342,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &ati28800k_spc6033p_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &ati28800k_spc6033p_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -4776,10 +4776,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &compaq_plasma_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &compaq_plasma_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -5459,10 +5459,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &gd5428_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5428_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -5498,10 +5498,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &gd5428_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5428_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -5618,10 +5618,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &gd5428_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5428_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -5696,10 +5696,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &s3_86c805_onboard_vlb_device,
.vid_device = NULL,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &s3_86c805_onboard_vlb_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -6289,10 +6289,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &tgui9440_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &tgui9440_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -6493,10 +6493,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &gd5430_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5430_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -7762,10 +7762,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &mach32_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &mach32_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -7879,10 +7879,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &gd5434_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5434_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -8766,10 +8766,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &s3_phoenix_trio64_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_phoenix_trio64_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -8807,10 +8807,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &s3_phoenix_trio64vplus_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_phoenix_trio64vplus_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -8848,10 +8848,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &s3_phoenix_trio64vplus_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_phoenix_trio64vplus_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -8889,10 +8889,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &s3_phoenix_trio64_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_phoenix_trio64_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -8968,10 +8968,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &gd5440_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5440_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -9891,10 +9891,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &s3_trio64v2_dx_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_trio64v2_dx_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -9930,10 +9930,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &s3_trio64v2_dx_onboard_pci_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_trio64v2_dx_onboard_pci_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -11902,11 +11902,11 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &es1371_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.snd_device = &es1371_onboard_device,
.net_device = NULL
},
/* Has a Winbond W83977TF Super I/O chip with on-chip KBC with AMIKey-2 KBC
@@ -11984,10 +11984,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &voodoo_3_2000_agp_onboard_8m_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &voodoo_3_2000_agp_onboard_8m_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -12024,10 +12024,10 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &voodoo_3_2000_agp_onboard_8m_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &voodoo_3_2000_agp_onboard_8m_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -12228,11 +12228,11 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &es1371_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.snd_device = &es1371_onboard_device,
.net_device = NULL
},
@@ -12314,11 +12314,11 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &es1371_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.snd_device = &es1371_onboard_device,
.net_device = NULL
},
/* VIA Apollo Pro */
@@ -12355,11 +12355,11 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &cmi8738_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.snd_device = &cmi8738_onboard_device,
.net_device = NULL
},
@@ -12849,11 +12849,11 @@ const machine_t machines[] = {
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = &cmi8738_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.snd_device = &cmi8738_onboard_device,
.net_device = NULL
},