Merge branch 'temp' into temp

2020-03-22 20:06:21 -06:00
parent 1ab21acd20 5bd2120151
commit 1ced5064ec
24 changed files with 1563 additions and 1920 deletions
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -307,7 +307,9 @@ extern int	machine_at_s1668_init(const machine_t *);
 #endif

 extern int	machine_at_6abx3_init(const machine_t *);
-
+#if defined(DEV_BRANCH) && defined(USE_I686) /*P2B-LS has no VIA C3 BIOS support, so further investigation may be needed*/
+extern int  machine_at_p2bls_init(const machine_t *);
+#endif

 /* m_at_t3100e.c */
 extern int	machine_at_t3100e_init(const machine_t *);