Merge pull request #2566 from jriwanek-forks/machine-table

Machine table changes and function cleanups

src/include/86box/machine.h

@@ -320,6 +320,9 @@ extern int   machine_get_machine_from_internal_name(char *s);
 extern void  machine_init(void);
 #ifdef EMU_DEVICE_H
 extern const device_t *machine_getdevice(int m);
+extern const device_t *machine_getviddevice(int m);
+extern const device_t *machine_getsnddevice(int m);
+extern const device_t *machine_getnetdevice(int m);
 #endif
 extern char *machine_get_internal_name_ex(int m);
 extern int   machine_get_nvrmask(int m);

src/machine/m_at_286_386sx.c

@@ -568,12 +568,6 @@ machine_at_scamp_common_init(const machine_t *model, int is_ps2)
     device_add(&vlsi_scamp_device);
 }
 
-const device_t *
-at_cmdsl386sx25_get_device(void)
-{
-    return &gd5402_onboard_device;
-}
-
 int
 machine_at_cmdsl386sx25_init(const machine_t *model)
 {
@@ -609,12 +603,6 @@ machine_at_dataexpert386sx_init(const machine_t *model)
     return ret;
 }
 
-const device_t *
-at_spc6033p_get_device(void)
-{
-    return &ati28800k_spc6033p_device;
-}
-
 int
 machine_at_spc6033p_init(const machine_t *model)
 {
@@ -719,12 +707,6 @@ machine_at_flytech386_init(const machine_t *model)
     return ret;
 }
 
-const device_t *
-at_flytech386_get_device(void)
-{
-    return &tvga8900d_device;
-}
-
 int
 machine_at_mr1217_init(const machine_t *model)
 {

src/machine/m_at_slot1.c

@@ -634,12 +634,6 @@ machine_at_ms6168_common_init(const machine_t *model)
     }
 }
 
-const device_t *
-at_ms6168_get_device(void)
-{
-    return &voodoo_3_2000_agp_onboard_8m_device;
-}
-
 int
 machine_at_borapro_init(const machine_t *model)
 {

src/machine/m_xt_t1000.c

@@ -902,12 +902,6 @@ machine_xt_t1000_init(const machine_t *model)
     return ret;
 }
 
-const device_t *
-t1200_get_device(void)
-{
-    return (&t1200_video_device);
-}
-
 int
 machine_xt_t1200_init(const machine_t *model)
 {