mirror of
https://github.com/sarah-walker-pcem/pcem.git
synced 2025-07-22 19:30:33 +02:00
Fixes to a few major things
* Moved NVR files out to be in just nvr, and will go in share/pcem/nvr * Fixed #88. Now the headers use the internal name to make descriptive sense * Fixed Spelling error on Hyundai *Also changed some issues with automation, testing also ntldd for dependency copying
This commit is contained in:
Michael J. Manley
70
.github/workflows/c-cpp.yml
vendored
70
.github/workflows/c-cpp.yml
vendored
@@ -14,8 +14,8 @@ jobs:
|
||||
include:
|
||||
- name: Ubuntu 64bit (gcc)
|
||||
os: ubuntu-latest
|
||||
args: -DUSE_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="build ${GITHUB_SHA::8}"
|
||||
artifacts_name: PCem-Ubuntu-${{ github.ref_name }}-${{ github.run_number }}
|
||||
args: -DUSE_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
|
||||
artifacts_name: PCem-vNext-Ubuntu-${{ github.run_number }}
|
||||
artifacts_path: PCem-${{ github.sha }}.tar.bz2
|
||||
installdeps: >-
|
||||
libsdl2-dev
|
||||
@@ -26,8 +26,8 @@ jobs:
|
||||
- name: Windows 32bits (MSYS2)
|
||||
os: windows-latest
|
||||
compiler: MINGW32
|
||||
args: -DUSE_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="build ${GITHUB_SHA::8}"
|
||||
artifacts_name: PCem-Windows-MINGW32-${{ github.ref_name }}-${{ github.run_number }}
|
||||
args: -DUSE_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
|
||||
artifacts_name: PCem-vNext-Windows-MINGW32-${{ github.run_number }}
|
||||
artifacts_path: PCem-${{ github.sha }}.zip
|
||||
installdeps: >-
|
||||
base-devel
|
||||
@@ -43,8 +43,8 @@ jobs:
|
||||
- name: Windows 64bits (MSYS2)
|
||||
os: windows-latest
|
||||
compiler: MINGW64
|
||||
args: -DUSE_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="build ${GITHUB_SHA::8}"
|
||||
artifacts_name: PCem-Windows-MINGW64-${{ github.ref_name }}-${{ github.run_number }}
|
||||
args: -DUSE_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
|
||||
artifacts_name: PCem-vNext-Windows-MINGW64-${{ github.run_number }}
|
||||
artifacts_path: PCem-${{ github.sha }}.zip
|
||||
installdeps: >-
|
||||
base-devel
|
||||
@@ -94,31 +94,10 @@ jobs:
|
||||
mkdir dist
|
||||
mkdir dist/bin
|
||||
mkdir dist/src
|
||||
mkdir dist/share
|
||||
mkdir dist/share/pcem
|
||||
cp -R ./temp/* dist/src
|
||||
rm -Rf ./dist/src/.git
|
||||
cp /mingw32/bin/libdeflate.dll dist/bin
|
||||
cp /mingw32/bin/libexpat-1.dll dist/bin
|
||||
cp /mingw32/bin/libgcc_s_dw2-1.dll dist/bin
|
||||
cp /mingw32/bin/libjpeg-8.dll dist/bin
|
||||
cp /mingw32/bin/liblzma-5.dll dist/bin
|
||||
cp /mingw32/bin/libopenal-1.dll dist/bin
|
||||
cp /mingw32/bin/libpng16-16.dll dist/bin
|
||||
cp /mingw32/bin/libstdc++-6.dll dist/bin
|
||||
cp /mingw32/bin/libtiff-5.dll dist/bin
|
||||
cp /mingw32/bin/libwebp-7.dll dist/bin
|
||||
cp /mingw32/bin/libwinpthread-1.dll dist/bin
|
||||
cp /mingw32/bin/libzstd.dll dist/bin
|
||||
cp /mingw32/bin/SDL2.dll dist/bin
|
||||
cp /mingw32/bin/libjbig-0.dll dist/bin
|
||||
cp /mingw32/bin/libLerc.dll dist/bin
|
||||
cp /mingw32/bin/wxbase30u_gcc_custom.dll dist/bin
|
||||
cp /mingw32/bin/wxbase30u_xml_gcc_custom.dll dist/bin
|
||||
cp /mingw32/bin/wxmsw30u_adv_gcc_custom.dll dist/bin
|
||||
cp /mingw32/bin/wxmsw30u_core_gcc_custom.dll dist/bin
|
||||
cp /mingw32/bin/wxmsw30u_html_gcc_custom.dll dist/bin
|
||||
cp /mingw32/bin/wxmsw30u_xrc_gcc_custom.dll dist/bin
|
||||
cp /mingw32/bin/zlib1.dll dist/bin
|
||||
cp /mingw32/bin/libpcap.dll dist/bin
|
||||
- name: prepare-package (Windows64)
|
||||
if: runner.os == 'Windows' && matrix.compiler == 'MINGW64'
|
||||
shell: msys2 {0}
|
||||
@@ -126,31 +105,10 @@ jobs:
|
||||
mkdir dist
|
||||
mkdir dist/bin
|
||||
mkdir dist/src
|
||||
mkdir dist/share
|
||||
mkdir dist/share/pcem
|
||||
cp -R ./temp/* dist/src
|
||||
rm -Rf ./dist/src/.git
|
||||
cp /mingw64/bin/libdeflate.dll dist/bin
|
||||
cp /mingw64/bin/libexpat-1.dll dist/bin
|
||||
cp /mingw64/bin/libgcc_s_seh-1.dll dist/bin
|
||||
cp /mingw64/bin/libjpeg-8.dll dist/bin
|
||||
cp /mingw64/bin/liblzma-5.dll dist/bin
|
||||
cp /mingw64/bin/libopenal-1.dll dist/bin
|
||||
cp /mingw64/bin/libpng16-16.dll dist/bin
|
||||
cp /mingw64/bin/libstdc++-6.dll dist/bin
|
||||
cp /mingw64/bin/libtiff-5.dll dist/bin
|
||||
cp /mingw64/bin/libwebp-7.dll dist/bin
|
||||
cp /mingw64/bin/libwinpthread-1.dll dist/bin
|
||||
cp /mingw64/bin/libzstd.dll dist/bin
|
||||
cp /mingw64/bin/SDL2.dll dist/bin
|
||||
cp /mingw64/bin/libjbig-0.dll dist/bin
|
||||
cp /mingw64/bin/libLerc.dll dist/bin
|
||||
cp /mingw64/bin/wxbase30u_gcc_custom.dll dist/bin
|
||||
cp /mingw64/bin/wxbase30u_xml_gcc_custom.dll dist/bin
|
||||
cp /mingw64/bin/wxmsw30u_adv_gcc_custom.dll dist/bin
|
||||
cp /mingw64/bin/wxmsw30u_core_gcc_custom.dll dist/bin
|
||||
cp /mingw64/bin/wxmsw30u_html_gcc_custom.dll dist/bin
|
||||
cp /mingw64/bin/wxmsw30u_xrc_gcc_custom.dll dist/bin
|
||||
cp /mingw64/bin/zlib1.dll dist/bin
|
||||
cp /mingw64/bin/libpcap.dll dist/bin
|
||||
- name: configure (Windows)
|
||||
if: runner.os == 'Windows'
|
||||
shell: msys2 {0}
|
||||
@@ -170,6 +128,9 @@ jobs:
|
||||
run: |
|
||||
cp ./temp/build/output/bin/pcem.exe dist/bin
|
||||
cp ./temp/build/output/bin/libpcem.dll dist/bin
|
||||
cp ./temp/nvr dist/share/pcem
|
||||
cp ./temp/roms dist/share/pcem
|
||||
ntldd -R "dist/bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="dist/bin"
|
||||
cd dist
|
||||
zip -r -9 ${{ matrix.artifacts_path }} *
|
||||
|
||||
@@ -180,6 +141,8 @@ jobs:
|
||||
mkdir dist/bin
|
||||
mkdir dist/lib
|
||||
mkdir dist/src
|
||||
mkdir dist/share
|
||||
mkdir dist/share/pcem
|
||||
cp -R ./temp/* dist/src
|
||||
rm -Rf ./dist/src/.git
|
||||
- name: configure (Linux)
|
||||
@@ -198,6 +161,8 @@ jobs:
|
||||
run: |
|
||||
cp ./temp/build/output/bin/pcem dist/bin
|
||||
cp ./temp/build/output/lib/libpcem.so dist/lib
|
||||
cp ./temp/nvr dist/share/pcem
|
||||
cp ./temp/roms dist/share/pcem
|
||||
cd dist
|
||||
tar -cjf ${{ matrix.artifacts_path }} *
|
||||
|
||||
@@ -206,4 +171,3 @@ jobs:
|
||||
with:
|
||||
name: ${{ matrix.artifacts_name }}
|
||||
path: ./dist/${{ matrix.artifacts_path }}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
- Numerous bugfixes in this build
|
||||
|
||||
## Added the following machines to v18
|
||||
- Huyndai SUPER-16T
|
||||
- Huyndai SUPER-16TE
|
||||
- Hyundai SUPER-16T
|
||||
- Hyundai SUPER-16TE
|
||||
- Commodore PC10C
|
||||
|
||||
## Developer Changes to v18
|
||||
|
||||
@@ -92,4 +92,5 @@ endif()
|
||||
|
||||
find_package(OpenGL REQUIRED)
|
||||
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(src)
|
||||
|
||||
|
||||
@@ -161,6 +161,7 @@ set(PCEM_PRIVATE_HEADERS ${PCEM_PRIVATE_HEADERS}
|
||||
${CMAKE_SOURCE_DIR}/includes/private/plat-keyboard.h
|
||||
${CMAKE_SOURCE_DIR}/includes/private/plat-midi.h
|
||||
${CMAKE_SOURCE_DIR}/includes/private/plat-mouse.h
|
||||
${CMAKE_SOURCE_DIR}/includes/private/plugin.h
|
||||
${CMAKE_SOURCE_DIR}/includes/private/ps1.h
|
||||
${CMAKE_SOURCE_DIR}/includes/private/ps2.h
|
||||
${CMAKE_SOURCE_DIR}/includes/private/ps2_mca.h
|
||||
@@ -394,4 +395,5 @@ set(PCEM_PUBLIC_HEADERS ${PCEM_PUBLIC_HEADERS}
|
||||
${CMAKE_SOURCE_DIR}/includes/public/pcem/devices.h
|
||||
${CMAKE_SOURCE_DIR}/includes/public/pcem/defines.h
|
||||
${CMAKE_SOURCE_DIR}/includes/public/pcem/cpu.h
|
||||
${CMAKE_SOURCE_DIR}/includes/public/pcem/plugin.h
|
||||
)
|
||||
|
||||
@@ -7,6 +7,8 @@ extern char nvr_path[512];
|
||||
extern char logs_path[512];
|
||||
extern char screenshots_path[512];
|
||||
extern char nvr_default_path[512];
|
||||
extern char plugins_default_path[512];
|
||||
extern char base_path[512];
|
||||
|
||||
void get_pcem_path(char *s, int size);
|
||||
void get_pcem_base_path(char *s, int size);
|
||||
@@ -29,6 +31,7 @@ void set_nvr_path(char *s);
|
||||
void set_logs_path(char *s);
|
||||
void set_configs_path(char *s);
|
||||
void set_screenshots_path(char *s);
|
||||
void set_plugins_path(char *s);
|
||||
|
||||
|
||||
#endif /* _PATHS_H_ */
|
||||
|
||||
6
includes/private/plugin.h
Normal file
6
includes/private/plugin.h
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifndef __PRIV_PLUGIN_H__
|
||||
#define __PRIV_PLUGIN_H__
|
||||
|
||||
void init_plugin_engine();
|
||||
|
||||
#endif /* __PRIV_PLUGIN_H__ */
|
||||
@@ -5,6 +5,4 @@
|
||||
const char *plugin_name = #name; \
|
||||
void init_plugin()
|
||||
|
||||
extern void init_plugin_engine();
|
||||
|
||||
#endif /* _PCEM_PLUGIN_H_ */
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -293,6 +293,7 @@ set(PCEM_SRC
|
||||
mcr.c
|
||||
paths.c
|
||||
pc.c
|
||||
plugin.c
|
||||
ppi.c
|
||||
pzx.c
|
||||
rtc.c
|
||||
@@ -482,3 +483,5 @@ target_link_libraries(pcem ${PCEM_LIBRARIES})
|
||||
add_executable(pcem-bin main.c)
|
||||
target_link_libraries(pcem-bin pcem ${PCEM_LIBRARIES})
|
||||
set_target_properties(pcem-bin PROPERTIES OUTPUT_NAME "pcem")
|
||||
add_custom_command(TARGET pcem-bin POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/roms ${CMAKE_BINARY_DIR}/output/share/pcem/roms)
|
||||
add_custom_command(TARGET pcem-bin POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/nvr ${CMAKE_BINARY_DIR}/output/share/pcem/nvr)
|
||||
|
||||
@@ -200,25 +200,26 @@ int hdd_controller_count()
|
||||
return ret;
|
||||
}
|
||||
|
||||
HDD_CONTROLLER h1 = {"None", "none", &null_hdd_device, 0, 0, 0};
|
||||
HDD_CONTROLLER h2 = {"[MFM] AT Fixed Disk Adapter", "mfm_at", &mfm_at_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h3 = {"[MFM] DTC 5150X", "dtc5150x", &dtc_5150x_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h4 = {"[MFM] Fixed Disk Adapter (Xebec)", "mfm_xebec", &mfm_xebec_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h5 = {"[ESDI] IBM ESDI Fixed Disk Controller", "esdi_mca", &hdd_esdi_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h6 = {"[ESDI] Western Digital WD1007V-SE1", "wd1007vse1", &wd1007vse1_device, 0, 0, 0};
|
||||
HDD_CONTROLLER h7 = {"[IDE] Standard IDE", "ide", &ide_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h8 = {"[IDE] XTIDE", "xtide", &xtide_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h9 = {"[IDE] XTIDE (AT)", "xtide_at", &xtide_at_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h10 = {"[IDE] XTIDE (PS/1)", "xtide_ps1", &xtide_ps1_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h11 = {"[SCSI] Adaptec AHA-1542C", "aha1542c", &scsi_aha1542c_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h12 = {"[SCSI] BusLogic BT-545S", "bt545s", &scsi_bt545s_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h13 = {"[SCSI] IBM SCSI Adapter with Cache", "ibmscsi_mca", &scsi_ibm_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h14 = {"[SCSI] Longshine LCS-6821N", "lcs6821n", &scsi_lcs6821n_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h15 = {"[SCSI] Rancho RT1000B", "rt1000b", &scsi_rt1000b_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h16 = {"[SCSI] Trantor T130B", "t130b", &scsi_t130b_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h_none = {"None", "none", &null_hdd_device, 0, 0, 0};
|
||||
HDD_CONTROLLER h_mfm_at = {"[MFM] AT Fixed Disk Adapter", "mfm_at", &mfm_at_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h_dtc5150x = {"[MFM] DTC 5150X", "dtc5150x", &dtc_5150x_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h_mfm_xebec = {"[MFM] Fixed Disk Adapter (Xebec)", "mfm_xebec", &mfm_xebec_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h_esdi_mca = {"[ESDI] IBM ESDI Fixed Disk Controller", "esdi_mca", &hdd_esdi_device, 1, 0, 0};
|
||||
HDD_CONTROLLER h_wd1007vse1 = {"[ESDI] Western Digital WD1007V-SE1", "wd1007vse1", &wd1007vse1_device, 0, 0, 0};
|
||||
HDD_CONTROLLER h_ide = {"[IDE] Standard IDE", "ide", &ide_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h_xtide = {"[IDE] XTIDE", "xtide", &xtide_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h_xtide_at = {"[IDE] XTIDE (AT)", "xtide_at", &xtide_at_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h_xtide_ps1 = {"[IDE] XTIDE (PS/1)", "xtide_ps1", &xtide_ps1_device, 0, 1, 0};
|
||||
HDD_CONTROLLER h_aha1542c = {"[SCSI] Adaptec AHA-1542C", "aha1542c", &scsi_aha1542c_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h_bt545s = {"[SCSI] BusLogic BT-545S", "bt545s", &scsi_bt545s_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h_ibmscsi_mca = {"[SCSI] IBM SCSI Adapter with Cache", "ibmscsi_mca", &scsi_ibm_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h_lcs6821n = {"[SCSI] Longshine LCS-6821N", "lcs6821n", &scsi_lcs6821n_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h_rt1000b = {"[SCSI] Rancho RT1000B", "rt1000b", &scsi_rt1000b_device, 0, 0, 1};
|
||||
HDD_CONTROLLER h_t130b = {"[SCSI] Trantor T130B", "t130b", &scsi_t130b_device, 0, 0, 1};
|
||||
|
||||
void pcem_add_hddcontroller(HDD_CONTROLLER *hddcontroller)
|
||||
{
|
||||
//TODO: Add sanity check to not go past MAX amount
|
||||
hdd_controllers[hdd_controller_count()] = hddcontroller;
|
||||
}
|
||||
|
||||
@@ -226,20 +227,20 @@ void hdd_controller_init_builtin()
|
||||
{
|
||||
memset(hdd_controllers, 0, sizeof(hdd_controllers));
|
||||
|
||||
pcem_add_hddcontroller(&h1);
|
||||
pcem_add_hddcontroller(&h2);
|
||||
pcem_add_hddcontroller(&h3);
|
||||
pcem_add_hddcontroller(&h4);
|
||||
pcem_add_hddcontroller(&h5);
|
||||
pcem_add_hddcontroller(&h6);
|
||||
pcem_add_hddcontroller(&h7);
|
||||
pcem_add_hddcontroller(&h8);
|
||||
pcem_add_hddcontroller(&h9);
|
||||
pcem_add_hddcontroller(&h10);
|
||||
pcem_add_hddcontroller(&h11);
|
||||
pcem_add_hddcontroller(&h12);
|
||||
pcem_add_hddcontroller(&h13);
|
||||
pcem_add_hddcontroller(&h14);
|
||||
pcem_add_hddcontroller(&h15);
|
||||
pcem_add_hddcontroller(&h16);
|
||||
pcem_add_hddcontroller(&h_none);
|
||||
pcem_add_hddcontroller(&h_mfm_at);
|
||||
pcem_add_hddcontroller(&h_dtc5150x);
|
||||
pcem_add_hddcontroller(&h_mfm_xebec);
|
||||
pcem_add_hddcontroller(&h_esdi_mca);
|
||||
pcem_add_hddcontroller(&h_wd1007vse1);
|
||||
pcem_add_hddcontroller(&h_ide);
|
||||
pcem_add_hddcontroller(&h_xtide);
|
||||
pcem_add_hddcontroller(&h_xtide_at);
|
||||
pcem_add_hddcontroller(&h_xtide_ps1);
|
||||
pcem_add_hddcontroller(&h_aha1542c);
|
||||
pcem_add_hddcontroller(&h_bt545s);
|
||||
pcem_add_hddcontroller(&h_ibmscsi_mca);
|
||||
pcem_add_hddcontroller(&h_lcs6821n);
|
||||
pcem_add_hddcontroller(&h_rt1000b);
|
||||
pcem_add_hddcontroller(&h_t130b);
|
||||
}
|
||||
@@ -777,117 +777,129 @@ void model_init()
|
||||
device_add(models[model]->device);
|
||||
}
|
||||
|
||||
MODEL m_1 = {"[8088] AMI XT clone", ROM_AMIXT, "amixt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
/* 8088 PC's */
|
||||
MODEL m_amixt = {"[8088] AMI XT clone", ROM_AMIXT, "amixt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_ataripc3 = {"[8088] Atari PC3", ROM_ATARIPC3, "ataripc3", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_cbm_pc10 = {"[8088] Commodore PC-10", ROM_CBM_PC10, "cbm_pc10", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 640, 640, 64, xt_init, NULL};
|
||||
MODEL m_compaq_pip = {"[8088] Compaq Portable Plus", ROM_COMPAQ_PIP, "compaq_pip", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 640, 64, compaq_xt_init, NULL};
|
||||
MODEL m_dtk = {"[8088] DTK XT clone", ROM_DTKXT, "dtk", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_genxt = {"[8088] Generic XT clone", ROM_GENXT, "genxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 32, 704, 16, xt_init, NULL};
|
||||
MODEL m_hyundaixt = {"[8088] Hyundai Super16T", ROM_SUPER16T, "hyundaixt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 640, 640, 64, xt_init, NULL};
|
||||
MODEL m_hyundaixte = {"[8088] Hyundai Super16TE", ROM_SUPER16TE, "hyundaixte", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 640, 640, 64, xt_init, NULL};
|
||||
MODEL m_ibmpc = {"[8088] IBM PC", ROM_IBMPC, "ibmpc", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 32, xt_init, NULL};
|
||||
MODEL m_ibmpcjr = {"[8088] IBM PCjr", ROM_IBMPCJR, "ibmpcjr", {{"", cpus_pcjr}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 128, 640, 64, pcjr_init, &pcjr_device};
|
||||
MODEL m_ibmxt = {"[8088] IBM XT", ROM_IBMXT, "ibmxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_jukopc = {"[8088] Juko XT clone", ROM_JUKOPC, "jukopc", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_ledge_modelm = {"[8088] Leading Edge Model M", ROM_LEDGE_MODELM, "ledge_modelm", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 704, 64, xt_init, NULL};
|
||||
MODEL m_ncr_pc4i = {"[8088] NCR PC4i", ROM_NCR_PC4I, "ncr_pc4i", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 256, 640, 64, xt_init, NULL};
|
||||
MODEL m_pxxt = {"[8088] Phoenix XT clone", ROM_PXXT, "pxxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_europc = {"[8088] Schneider EuroPC", ROM_EUROPC, "europc", {{"", cpus_europc}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 512, 640, 128, europc_init, NULL};
|
||||
MODEL m_tandy = {"[8088] Tandy 1000", ROM_TANDY, "tandy", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 128, 640, 128, tandy1k_init, &tandy1000_device};
|
||||
MODEL m_tandy1000hx = {"[8088] Tandy 1000 HX", ROM_TANDY1000HX, "tandy1000hx", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 256, 640, 128, tandy1k_init, &tandy1000hx_device};
|
||||
MODEL m_to16_pc = {"[8088] Thomson TO16 PC", ROM_TO16_PC, "to16_pc", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 512, 640, 128, xt_init, NULL};
|
||||
MODEL m_t1000 = {"[8088] Toshiba T1000", ROM_T1000, "t1000", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 512, 1280, 768, xt_t1000_init, NULL};
|
||||
MODEL m_ltxt = {"[8088] VTech Laser Turbo XT", ROM_LTXT, "ltxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 1152, 64, xt_laserxt_init, NULL};
|
||||
MODEL m_xi8088 = {"[8088] Xi8088", ROM_XI8088, "xi8088", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2, 64, 1024, 128, xt_xi8088_init, &xi8088_device};
|
||||
MODEL m_zdsupers = {"[8088] Zenith Data SupersPort", ROM_ZD_SUPERS, "zdsupers", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 640, 128, xt_zenith_init, NULL};
|
||||
|
||||
MODEL m_2 = {"[8088] Atari PC3", ROM_ATARIPC3, "ataripc3", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_cbmPC10 = {"[8088] Commodore PC-10", ROM_CBM_PC10, "cbm_pc10", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 640, 640, 64, xt_init, NULL};
|
||||
MODEL m_3 = {"[8088] Compaq Portable Plus", ROM_COMPAQ_PIP, "compaq_pip", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 640, 64, compaq_xt_init, NULL};
|
||||
MODEL m_4 = {"[8088] DTK XT clone", ROM_DTKXT, "dtk", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_5 = {"[8088] Generic XT clone", ROM_GENXT, "genxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 32, 704, 16, xt_init, NULL};
|
||||
MODEL m_huyndai16t = {"[8088] Huyndai Super16T", ROM_SUPER16T, "hyundaixt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 640, 640, 64, xt_init, NULL};
|
||||
MODEL m_huyndai16te = {"[8088] Huyndai Super16TE", ROM_SUPER16TE, "huyndaixte", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 640, 640, 64, xt_init, NULL};
|
||||
MODEL m_6 = {"[8088] IBM PC", ROM_IBMPC, "ibmpc", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 32, xt_init, NULL};
|
||||
MODEL m_7 = {"[8088] IBM PCjr", ROM_IBMPCJR, "ibmpcjr", {{"", cpus_pcjr}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 128, 640, 64, pcjr_init, &pcjr_device};
|
||||
MODEL m_8 = {"[8088] IBM XT", ROM_IBMXT, "ibmxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_9 = {"[8088] Juko XT clone", ROM_JUKOPC, "jukopc", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_10 = {"[8088] Leading Edge Model M", ROM_LEDGE_MODELM, "ledge_modelm", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 704, 64, xt_init, NULL};
|
||||
MODEL m_11 = {"[8088] NCR PC4i", ROM_NCR_PC4I, "ncr_pc4i", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 256, 640, 64, xt_init, NULL};
|
||||
MODEL m_12 = {"[8088] Phoenix XT clone", ROM_PXXT, "pxxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 640, 64, xt_init, NULL};
|
||||
MODEL m_13 = {"[8088] Schneider EuroPC", ROM_EUROPC, "europc", {{"", cpus_europc}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 512, 640, 128, europc_init, NULL};
|
||||
MODEL m_14 = {"[8088] Tandy 1000", ROM_TANDY, "tandy", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 128, 640, 128, tandy1k_init, &tandy1000_device};
|
||||
MODEL m_15 = {"[8088] Tandy 1000 HX", ROM_TANDY1000HX, "tandy1000hx", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 256, 640, 128, tandy1k_init, &tandy1000hx_device};
|
||||
MODEL m_16 = {"[8088] Thomson TO16 PC", ROM_TO16_PC, "to16_pc", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 512, 640, 128, xt_init, NULL};
|
||||
MODEL m_17 = {"[8088] Toshiba T1000", ROM_T1000, "t1000", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 512, 1280, 768, xt_t1000_init, NULL};
|
||||
MODEL m_18 = {"[8088] VTech Laser Turbo XT", ROM_LTXT, "ltxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 64, 1152, 64, xt_laserxt_init, NULL};
|
||||
MODEL m_19 = {"[8088] Xi8088", ROM_XI8088, "xi8088", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2, 64, 1024, 128, xt_xi8088_init, &xi8088_device};
|
||||
MODEL m_20 = {"[8088] Zenith Data SupersPort", ROM_ZD_SUPERS, "zdsupers", {{"", cpus_8088}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 640, 128, xt_zenith_init, NULL};
|
||||
/* 8086 PC's */
|
||||
MODEL m_pc1512 = {"[8086] Amstrad PC1512", ROM_PC1512, "pc1512", {{"", cpus_pc1512}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AMSTRAD, 512, 640, 128, ams_init, &ams1512_device};
|
||||
MODEL m_pc1640 = {"[8086] Amstrad PC1640", ROM_PC1640, "pc1640", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 640, 640, 0, ams_init, &ams1512_device};
|
||||
MODEL m_pc2086 = {"[8086] Amstrad PC2086", ROM_PC2086, "pc2086", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 640, 640, 0, ams_init, &ams2086_device};
|
||||
MODEL m_pc3086 = {"[8086] Amstrad PC3086", ROM_PC3086, "pc3086", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 640, 640, 0, ams_init, &ams3086_device};
|
||||
MODEL m_pc5086 = {"[8086] Amstrad PC5086", ROM_PC5086, "pc5086", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_PS2, 640, 640, 0, pc5086_init, &f82c710_upc_device};
|
||||
MODEL m_ppc512 = {"[8086] Amstrad PPC512/640", ROM_PPC512, "ppc512", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 512, 640, 128, ams_init, &ams1512_device};
|
||||
MODEL m_deskpro = {"[8086] Compaq Deskpro", ROM_DESKPRO, "deskpro", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 640, 128, compaq_xt_init, NULL};
|
||||
MODEL m_olivetti_m24 = {"[8086] Olivetti M24", ROM_OLIM24, "olivetti_m24", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_OLIM24, 128, 640, 128, olim24_init, NULL};
|
||||
MODEL m_pc200 = {"[8086] Sinclair PC200", ROM_PC200, "pc200", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 512, 640, 128, ams_init, &ams1512_device};
|
||||
MODEL m_tandy1000sl2 = {"[8086] Tandy 1000 SL/2", ROM_TANDY1000SL2, "tandy1000sl2", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 512, 768, 128, tandy1ksl2_init, NULL};
|
||||
MODEL m_t1200 = {"[8088] Toshiba T1200", ROM_T1200, "t1200", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 1024, 2048, 1024, xt_t1200_init, NULL};
|
||||
MODEL m_lxt3 = {"[8086] VTech Laser XT3", ROM_LXT3, "lxt3", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 512, 1152, 128, xt_laserxt_init, NULL};
|
||||
|
||||
MODEL m_21 = {"[8086] Amstrad PC1512", ROM_PC1512, "pc1512", {{"", cpus_pc1512}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AMSTRAD, 512, 640, 128, ams_init, &ams1512_device};
|
||||
MODEL m_22 = {"[8086] Amstrad PC1640", ROM_PC1640, "pc1640", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 640, 640, 0, ams_init, &ams1512_device};
|
||||
MODEL m_23 = {"[8086] Amstrad PC2086", ROM_PC2086, "pc2086", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 640, 640, 0, ams_init, &ams2086_device};
|
||||
MODEL m_24 = {"[8086] Amstrad PC3086", ROM_PC3086, "pc3086", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 640, 640, 0, ams_init, &ams3086_device};
|
||||
MODEL m_25 = {"[8086] Amstrad PC5086", ROM_PC5086, "pc5086", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_PS2, 640, 640, 0, pc5086_init, &f82c710_upc_device};
|
||||
MODEL m_26 = {"[8086] Amstrad PPC512/640", ROM_PPC512, "ppc512", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 512, 640, 128, ams_init, &ams1512_device};
|
||||
MODEL m_27 = {"[8086] Compaq Deskpro", ROM_DESKPRO, "deskpro", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 128, 640, 128, compaq_xt_init, NULL};
|
||||
MODEL m_28 = {"[8086] Olivetti M24", ROM_OLIM24, "olivetti_m24", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_OLIM24, 128, 640, 128, olim24_init, NULL};
|
||||
MODEL m_29 = {"[8086] Sinclair PC200", ROM_PC200, "pc200", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AMSTRAD, 512, 640, 128, ams_init, &ams1512_device};
|
||||
MODEL m_30 = {"[8086] Tandy 1000 SL/2", ROM_TANDY1000SL2, "tandy1000sl2", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 512, 768, 128, tandy1ksl2_init, NULL};
|
||||
MODEL m_31 = {"[8088] Toshiba T1200", ROM_T1200, "t1200", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED, 1024, 2048, 1024, xt_t1200_init, NULL};
|
||||
MODEL m_32 = {"[8086] VTech Laser XT3", ROM_LXT3, "lxt3", {{"", cpus_8086}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE, 512, 1152, 128, xt_laserxt_init, NULL};
|
||||
/* 286 PC's */
|
||||
MODEL m_ami286 = {"[286] AMI 286 clone", ROM_AMI286, "ami286", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_neat_init, NULL};
|
||||
MODEL m_award286 = {"[286] Award 286 clone", ROM_AWARD286, "award286", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_scat_init, NULL};
|
||||
MODEL m_bull_micral_45 = {"[286] Bull Micral 45", ROM_BULL_MICRAL_45, "bull_micral_45", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1024, 6144, 128, ibm_at_init, NULL};
|
||||
MODEL m_cmdpc30 = {"[286] Commodore PC 30 III", ROM_CMDPC30, "cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 640, 16384, 128, at_cbm_init, NULL};
|
||||
MODEL m_compaq_pii = {"[286] Compaq Portable II", ROM_COMPAQ_PII, "compaq_pii", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 256, 15872, 128, ibm_at_init, NULL};
|
||||
MODEL m_dells200 = {"[286] DELL System 200", ROM_DELL200, "dells200", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 640, 16384, 128, dells200_init, NULL};
|
||||
MODEL m_epson_pcax = {"[286] Epson PC AX", ROM_EPSON_PCAX, "epson_pcax", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, at_init, NULL};
|
||||
MODEL m_epson_pcax2e = {"[286] Epson PC AX2e", ROM_EPSON_PCAX2E, "epson_pcax2e", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2, 256, 15872, 128, at_init, NULL};
|
||||
MODEL m_gdc212m = {"[286] Goldstar GDC-212M", ROM_GDC212M, "gdc212m", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 512, 4096, 512, at_scat_init, NULL};
|
||||
MODEL m_gw286ct = {"[286] GW-286CT GEAR", ROM_GW286CT, "gw286ct", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 512, 16384, 128, at_scat_init, NULL};
|
||||
MODEL m_super286tr = {"[286] Hyundai Super-286TR", ROM_HYUNDAI_SUPER286TR, "super286tr", {{"AMD", cpus_super286tr}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1024, 4096, 128, at_scat_init, &f82c710_upc_device};
|
||||
MODEL m_ibmat = {"[286] IBM AT", ROM_IBMAT, "ibmat", {{"", cpus_ibmat}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, ibm_at_init, NULL};
|
||||
MODEL m_ibmps1es = {"[286] IBM PS/1 model 2011", ROM_IBMPS1_2011, "ibmps1es", {{"", cpus_ps1_m2011}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2, 512, 16384, 512, ps1_m2011_init, NULL};
|
||||
MODEL m_ibmps2_m30_286 = {"[286] IBM PS/2 Model 30-286", ROM_IBMPS2_M30_286, "ibmps2_m30_286", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2, 1, 16, 1, ps2_m30_286_init, NULL};
|
||||
MODEL m_ibmps2_m50 = {"[286] IBM PS/2 Model 50", ROM_IBMPS2_M50, "ibmps2_m50", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 1, 16, 1, ps2_model_50_init, NULL};
|
||||
MODEL m_ibmxt286 = {"[286] IBM XT Model 286", ROM_IBMXT286, "ibmxt286", {{"", cpus_ibmxt286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, ibm_at_init, NULL};
|
||||
MODEL m_spc4200p = {"[286] Samsung SPC-4200P", ROM_SPC4200P, "spc4200p", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 512, 2048, 128, at_scat_init, NULL};
|
||||
MODEL m_spc4216p = {"[286] Samsung SPC-4216P", ROM_SPC4216P, "spc4216p", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 5, 1, at_scat_init, NULL};
|
||||
MODEL m_spc4620p = {"[286] Samsung SPC-4620P", ROM_SPC4620P, "spc4620p", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 5, 1, at_scat_init, NULL};
|
||||
MODEL m_t3100e = {"[286] Toshiba T3100e", ROM_T3100E, "t3100e", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_HAS_IDE, 1024, 5120, 256, at_t3100e_init, NULL};
|
||||
MODEL m_tg286m = {"[286] Trigem 286M", ROM_TG286M, "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 8192, 128, at_headland_init, NULL};
|
||||
MODEL m_tulip_tc7 = {"[286] Tulip AT Compact", ROM_TULIP_TC7, "tulip_tc7", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 640, 15872, 128, ibm_at_init, NULL};
|
||||
|
||||
MODEL m_33 = {"[286] AMI 286 clone", ROM_AMI286, "ami286", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_neat_init, NULL};
|
||||
MODEL m_34 = {"[286] Award 286 clone", ROM_AWARD286, "award286", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_scat_init, NULL};
|
||||
MODEL m_35 = {"[286] Bull Micral 45", ROM_BULL_MICRAL_45, "bull_micral_45", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1024, 6144, 128, ibm_at_init, NULL};
|
||||
MODEL m_36 = {"[286] Commodore PC 30 III", ROM_CMDPC30, "cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 640, 16384, 128, at_cbm_init, NULL};
|
||||
MODEL m_37 = {"[286] Compaq Portable II", ROM_COMPAQ_PII, "compaq_pii", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 256, 15872, 128, ibm_at_init, NULL};
|
||||
MODEL m_38 = {"[286] DELL System 200", ROM_DELL200, "dells200", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 640, 16384, 128, dells200_init, NULL};
|
||||
MODEL m_39 = {"[286] Epson PC AX", ROM_EPSON_PCAX, "epson_pcax", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, at_init, NULL};
|
||||
MODEL m_40 = {"[286] Epson PC AX2e", ROM_EPSON_PCAX2E, "epson_pcax2e", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2, 256, 15872, 128, at_init, NULL};
|
||||
MODEL m_41 = {"[286] Goldstar GDC-212M", ROM_GDC212M, "gdc212m", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 512, 4096, 512, at_scat_init, NULL};
|
||||
MODEL m_42 = {"[286] GW-286CT GEAR", ROM_GW286CT, "gw286ct", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 512, 16384, 128, at_scat_init, NULL};
|
||||
MODEL m_43 = {"[286] Hyundai Super-286TR", ROM_HYUNDAI_SUPER286TR, "super286tr", {{"AMD", cpus_super286tr}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1024, 4096, 128, at_scat_init, &f82c710_upc_device};
|
||||
MODEL m_44 = {"[286] IBM AT", ROM_IBMAT, "ibmat", {{"", cpus_ibmat}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, ibm_at_init, NULL};
|
||||
MODEL m_45 = {"[286] IBM PS/1 model 2011", ROM_IBMPS1_2011, "ibmps1es", {{"", cpus_ps1_m2011}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2, 512, 16384, 512, ps1_m2011_init, NULL};
|
||||
MODEL m_46 = {"[286] IBM PS/2 Model 30-286", ROM_IBMPS2_M30_286, "ibmps2_m30_286", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2, 1, 16, 1, ps2_m30_286_init, NULL};
|
||||
MODEL m_47 = {"[286] IBM PS/2 Model 50", ROM_IBMPS2_M50, "ibmps2_m50", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 1, 16, 1, ps2_model_50_init, NULL};
|
||||
MODEL m_48 = {"[286] IBM XT Model 286", ROM_IBMXT286, "ibmxt286", {{"", cpus_ibmxt286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, ibm_at_init, NULL};
|
||||
MODEL m_49 = {"[286] Samsung SPC-4200P", ROM_SPC4200P, "spc4200p", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 512, 2048, 128, at_scat_init, NULL};
|
||||
MODEL m_50 = {"[286] Samsung SPC-4216P", ROM_SPC4216P, "spc4216p", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 5, 1, at_scat_init, NULL};
|
||||
MODEL m_51 = {"[286] Samsung SPC-4620P", ROM_SPC4620P, "spc4620p", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_HW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 5, 1, at_scat_init, NULL};
|
||||
MODEL m_52 = {"[286] Toshiba T3100e", ROM_T3100E, "t3100e", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_HAS_IDE, 1024, 5120, 256, at_t3100e_init, NULL};
|
||||
MODEL m_53 = {"[286] Trigem 286M", ROM_TG286M, "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 8192, 128, at_headland_init, NULL};
|
||||
MODEL m_54 = {"[286] Tulip AT Compact", ROM_TULIP_TC7, "tulip_tc7", {{"", cpus_286}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 640, 15872, 128, ibm_at_init, NULL};
|
||||
/* 386SX PC's */
|
||||
MODEL m_acer386 = {"[386SX] Acer 386SX25/N", ROM_ACER386, "acer386", {{"Intel", cpus_acer}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, at_acer386sx_init, NULL};
|
||||
MODEL m_ama932j = {"[386SX] AMA-932J", ROM_AMA932J, "ama932j", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_HAS_IDE, 512, 8192, 128, at_headland_init, NULL};
|
||||
MODEL m_ami386 = {"[386SX] AMI 386SX clone", ROM_AMI386SX, "ami386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_headland_init, NULL};
|
||||
MODEL m_megapc = {"[386SX] Amstrad MegaPC", ROM_MEGAPC, "megapc", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_DISABLE_HW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, at_wd76c10_init, NULL};
|
||||
MODEL m_cbm_sl386sx25 = {"[386SX] Commodore SL386SX-25", ROM_CBM_SL386SX25, "cbm_sl386sx25", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1024, 16384, 512, at_scamp_init, NULL};
|
||||
MODEL m_dtk386 = {"[386SX] DTK 386SX clone", ROM_DTK386, "dtk386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_neat_init, NULL};
|
||||
MODEL m_epson_pcax3 = {"[386SX] Epson PC AX3", ROM_EPSON_PCAX3, "epson_pcax3", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, at_init, NULL};
|
||||
MODEL m_ibmps1_2121 = {"[386SX] IBM PS/1 model 2121", ROM_IBMPS1_2121, "ibmps1_2121", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, ps1_m2121_init, NULL};
|
||||
MODEL m_ibmps2_m55sx = {"[386SX] IBM PS/2 Model 55SX", ROM_IBMPS2_M55SX, "ibmps2_m55sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 1, 8, 1, ps2_model_55sx_init, NULL};
|
||||
MODEL m_kmxc02 = {"[386SX] KMX-C-02", ROM_KMXC02, "kmxc02", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT, 512, 16384, 512, at_scatsx_init, NULL};
|
||||
MODEL m_pb_l300sx = {"[386SX] Packard Bell Legend 300SX", ROM_PB_L300SX, "pb_l300sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, pb_l300sx_init, NULL};
|
||||
MODEL m_spc6033p = {"[386SX] Samsung SPC-6033P", ROM_SPC6033P, "spc6033p", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_DISABLE_HW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 2, 12, 2, at_scamp_init, NULL};
|
||||
|
||||
MODEL m_55 = {"[386SX] Acer 386SX25/N", ROM_ACER386, "acer386", {{"Intel", cpus_acer}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, at_acer386sx_init, NULL};
|
||||
MODEL m_56 = {"[386SX] AMA-932J", ROM_AMA932J, "ama932j", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_HAS_IDE, 512, 8192, 128, at_headland_init, NULL};
|
||||
MODEL m_57 = {"[386SX] AMI 386SX clone", ROM_AMI386SX, "ami386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_headland_init, NULL};
|
||||
MODEL m_58 = {"[386SX] Amstrad MegaPC", ROM_MEGAPC, "megapc", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_DISABLE_HW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, at_wd76c10_init, NULL};
|
||||
MODEL m_59 = {"[386SX] Commodore SL386SX-25", ROM_CBM_SL386SX25, "cbm_sl386sx25", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1024, 16384, 512, at_scamp_init, NULL};
|
||||
MODEL m_60 = {"[386SX] DTK 386SX clone", ROM_DTK386, "dtk386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 512, 16384, 128, at_neat_init, NULL};
|
||||
MODEL m_61 = {"[386SX] Epson PC AX3", ROM_EPSON_PCAX3, "epson_pcax3", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT, 256, 15872, 128, at_init, NULL};
|
||||
MODEL m_62 = {"[386SX] IBM PS/1 model 2121", ROM_IBMPS1_2121, "ibmps1_2121", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, ps1_m2121_init, NULL};
|
||||
MODEL m_63 = {"[386SX] IBM PS/2 Model 55SX", ROM_IBMPS2_M55SX, "ibmps2_m55sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 1, 8, 1, ps2_model_55sx_init, NULL};
|
||||
MODEL m_64 = {"[386SX] KMX-C-02", ROM_KMXC02, "kmxc02", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT, 512, 16384, 512, at_scatsx_init, NULL};
|
||||
MODEL m_65 = {"[386SX] Packard Bell Legend 300SX", ROM_PB_L300SX, "pb_l300sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 16, 1, pb_l300sx_init, NULL};
|
||||
MODEL m_66 = {"[386SX] Samsung SPC-6033P", ROM_SPC6033P, "spc6033p", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}}, MODEL_GFX_DISABLE_HW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 2, 12, 2, at_scamp_init, NULL};
|
||||
/* 386DX PC's */
|
||||
MODEL m_ami386dx = {"[386DX] AMI 386DX clone", ROM_AMI386DX_OPTI495, "ami386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_opti495_init, NULL};
|
||||
MODEL m_deskpro386 = {"[386DX] Compaq Deskpro 386", ROM_DESKPRO_386, "deskpro386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT, 1, 15, 1, deskpro386_init, NULL};
|
||||
MODEL m_ecs_386_32 = {"[386DX] ECS 386/32", ROM_ECS_386_32, "ecs_386_32", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT, 1, 16, 1, at_cs8230_init, NULL};
|
||||
MODEL m_ibmps2_m70_type3 = {"[386DX] IBM PS/2 Model 70 (type 3)", ROM_IBMPS2_M70_TYPE3, "ibmps2_m70_type3", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 2, 16, 2, ps2_model_70_init, NULL};
|
||||
MODEL m_ibmps2_m80 = {"[386DX] IBM PS/2 Model 80", ROM_IBMPS2_M80, "ibmps2_m80", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 1, 12, 1, ps2_model_80_init, NULL};
|
||||
MODEL m_mr386dx = {"[386DX] MR 386DX clone", ROM_MR386DX_OPTI495, "mr386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_opti495_init, NULL};
|
||||
MODEL m_spc6000a = {"[386DX] Samsung SPC-6000A", ROM_SPC6000A, "spc6000a", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 32, 1, at_cs8230_init, NULL};
|
||||
|
||||
MODEL m_67 = {"[386DX] AMI 386DX clone", ROM_AMI386DX_OPTI495, "ami386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_opti495_init, NULL};
|
||||
MODEL m_68 = {"[386DX] Compaq Deskpro 386", ROM_DESKPRO_386, "deskpro386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT, 1, 15, 1, deskpro386_init, NULL};
|
||||
MODEL m_69 = {"[386DX] ECS 386/32", ROM_ECS_386_32, "ecs_386_32", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT, 1, 16, 1, at_cs8230_init, NULL};
|
||||
MODEL m_70 = {"[386DX] IBM PS/2 Model 70 (type 3)", ROM_IBMPS2_M70_TYPE3, "ibmps2_m70_type3", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 2, 16, 2, ps2_model_70_init, NULL};
|
||||
MODEL m_71 = {"[386DX] IBM PS/2 Model 80", ROM_IBMPS2_M80, "ibmps2_m80", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 1, 12, 1, ps2_model_80_init, NULL};
|
||||
MODEL m_72 = {"[386DX] MR 386DX clone", ROM_MR386DX_OPTI495, "mr386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_opti495_init, NULL};
|
||||
MODEL m_73 = {"[386DX] Samsung SPC-6000A", ROM_SPC6000A, "spc6000a", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 32, 1, at_cs8230_init, NULL};
|
||||
/* 486 PC's */
|
||||
MODEL m_ami486 = {"[486] AMI 486 clone", ROM_AMI486, "ami486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_ali1429_init, NULL};
|
||||
MODEL m_win486 = {"[486] AMI WinBIOS 486", ROM_WIN486, "win486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_ali1429_init, NULL};
|
||||
MODEL m_sis496 = {"[486] Award SiS 496/497", ROM_SIS496, "sis496", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_HAS_IDE, 1, 256, 1, at_sis496_init, NULL};
|
||||
MODEL m_elx_pc425x = {"[486] Elonex PC-425X", ROM_ELX_PC425X, "elx_pc425x", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_sl82c460_init, NULL};
|
||||
MODEL m_ibmps1_2133 = {"[486] IBM PS/1 Model 2133 (EMEA 451)", ROM_IBMPS1_2133_451, "ibmps1_2133", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2, 2, 64, 2, ps1_m2133_init, NULL};
|
||||
MODEL m_ibmps2_m70_type4 = {"[486] IBM PS/2 Model 70 (type 4)", ROM_IBMPS2_M70_TYPE4, "ibmps2_m70_type4", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 2, 16, 2, ps2_model_70_init, NULL};
|
||||
MODEL m_pb410a = {"[486] Packard Bell PB410A", ROM_PB410A, "pb410a", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 64, 1, at_pb410a_init, NULL};
|
||||
|
||||
MODEL m_74 = {"[486] AMI 486 clone", ROM_AMI486, "ami486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_ali1429_init, NULL};
|
||||
MODEL m_75 = {"[486] AMI WinBIOS 486", ROM_WIN486, "win486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_NONE | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_ali1429_init, NULL};
|
||||
MODEL m_76 = {"[486] Award SiS 496/497", ROM_SIS496, "sis496", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_HAS_IDE, 1, 256, 1, at_sis496_init, NULL};
|
||||
MODEL m_77 = {"[486] Elonex PC-425X", ROM_ELX_PC425X, "elx_pc425x", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_HAS_IDE, 1, 256, 1, at_sl82c460_init, NULL};
|
||||
MODEL m_78 = {"[486] IBM PS/1 Model 2133 (EMEA 451)", ROM_IBMPS1_2133_451, "ibmps1_2133", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_FIXED | MODEL_AT | MODEL_PS2, 2, 64, 2, ps1_m2133_init, NULL};
|
||||
MODEL m_79 = {"[486] IBM PS/2 Model 70 (type 4)", ROM_IBMPS2_M70_TYPE4, "ibmps2_m70_type4", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_MCA, 2, 16, 2, ps2_model_70_init, NULL};
|
||||
MODEL m_80 = {"[486] Packard Bell PB410A", ROM_PB410A, "pb410a", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PS2 | MODEL_HAS_IDE, 1, 64, 1, at_pb410a_init, NULL};
|
||||
/* Socket 4 PC's */
|
||||
MODEL m_revenge = {"[Socket 4] Intel Premiere/PCI", ROM_REVENGE, "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_batman_init, NULL};
|
||||
MODEL m_pb520r = {"[Socket 4] Packard Bell PB520R", ROM_PB520R, "pb520r", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_pb520r_init, NULL};
|
||||
|
||||
MODEL m_81 = {"[Socket 4] Intel Premiere/PCI", ROM_REVENGE, "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_batman_init, NULL};
|
||||
MODEL m_82 = {"[Socket 4] Packard Bell PB520R", ROM_PB520R, "pb520r", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_pb520r_init, NULL};
|
||||
/* Socket 5 PC's */
|
||||
MODEL m_endeavor = {"[Socket 5] Intel Advanced/EV", ROM_ENDEAVOR, "endeavor", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_endeavor_init, NULL};
|
||||
MODEL m_zappa = {"[Socket 5] Intel Advanced/ZP", ROM_ZAPPA, "zappa", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_zappa_init, NULL};
|
||||
MODEL m_infowaym = {"[Socket 5] Itautec Infoway Multimidia", ROM_ITAUTEC_INFOWAYM, "infowaym", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_zappa_init, NULL};
|
||||
MODEL m_pb570 = {"[Socket 5] Packard Bell PB570", ROM_PB570, "pb570", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_pb570_init, NULL};
|
||||
|
||||
MODEL m_83 = {"[Socket 5] Intel Advanced/EV", ROM_ENDEAVOR, "endeavor", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_endeavor_init, NULL};
|
||||
MODEL m_84 = {"[Socket 5] Intel Advanced/ZP", ROM_ZAPPA, "zappa", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_zappa_init, NULL};
|
||||
MODEL m_85 = {"[Socket 5] Itautec Infoway Multimidia", ROM_ITAUTEC_INFOWAYM, "infowaym", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_zappa_init, NULL};
|
||||
MODEL m_86 = {"[Socket 5] Packard Bell PB570", ROM_PB570, "pb570", {{"Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}}, MODEL_GFX_DISABLE_SW | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 128, 1, at_pb570_init, NULL};
|
||||
/* Socket 7 PC's */
|
||||
MODEL m_p55tvp4 = {"[Socket 7] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_p55tvp4_init, NULL};
|
||||
MODEL m_p55t2p4 = {"[Socket 7] ASUS P/I-P55T2P4", ROM_P55T2P4, "p55t2p4", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 256, 1, at_p55t2p4_init, NULL};
|
||||
MODEL m_p55va = {"[Socket 7] Epox P55-VA", ROM_P55VA, "p55va", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_p55va_init, NULL};
|
||||
MODEL m_430vx = {"[Socket 7] Shuttle HOT-557", ROM_430VX, "430vx", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_i430vx_init, NULL};
|
||||
|
||||
MODEL m_87 = {"[Socket 7] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_p55tvp4_init, NULL};
|
||||
MODEL m_88 = {"[Socket 7] ASUS P/I-P55T2P4", ROM_P55T2P4, "p55t2p4", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 256, 1, at_p55t2p4_init, NULL};
|
||||
MODEL m_89 = {"[Socket 7] Epox P55-VA", ROM_P55VA, "p55va", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_p55va_init, NULL};
|
||||
MODEL m_90 = {"[Socket 7] Shuttle HOT-557", ROM_430VX, "430vx", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_S7}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 128, 1, at_i430vx_init, NULL};
|
||||
/* Super 7 PC's */
|
||||
MODEL m_fic_va503p = {"[Super 7] FIC VA-503+", ROM_FIC_VA503P, "fic_va503p", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_SS7}, {"IDT", cpus_WinChip_SS7}, {"Cyrix", cpus_6x86_SS7}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 512, 1, at_mvp3_init, NULL};
|
||||
|
||||
MODEL m_91 = {"[Super 7] FIC VA-503+", ROM_FIC_VA503P, "fic_va503p", {{"Intel", cpus_Pentium}, {"AMD", cpus_K6_SS7}, {"IDT", cpus_WinChip_SS7}, {"Cyrix", cpus_6x86_SS7}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 1, 512, 1, at_mvp3_init, NULL};
|
||||
/* Socket 8 PC's */
|
||||
MODEL m_vs440fx = {"[Socket 8] Intel VS440FX", ROM_VS440FX, "vs440fx", {{"Intel", cpus_PentiumPro}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 256, 8, at_vs440fx_init, NULL};
|
||||
|
||||
MODEL m_92 = {"[Socket 8] Intel VS440FX", ROM_VS440FX, "vs440fx", {{"Intel", cpus_PentiumPro}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 256, 8, at_vs440fx_init, NULL};
|
||||
|
||||
MODEL m_93 = {"[Slot 1] Gigabyte GA-686BX", ROM_GA686BX, "ga686bx", {{"Intel", cpus_Slot1_100MHz}, {"VIA", cpus_VIA_100MHz}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 512, 8, at_ga686bx_init, NULL};
|
||||
/* Slot 1 PC's */
|
||||
MODEL m_ga686bx = {"[Slot 1] Gigabyte GA-686BX", ROM_GA686BX, "ga686bx", {{"Intel", cpus_Slot1_100MHz}, {"VIA", cpus_VIA_100MHz}}, MODEL_GFX_NONE | MODEL_AT | MODEL_PCI | MODEL_PS2 | MODEL_HAS_IDE, 8, 512, 8, at_ga686bx_init, NULL};
|
||||
|
||||
void pcem_add_model(MODEL *model)
|
||||
{
|
||||
//TODO: Add sanity check to not go past MAX amount
|
||||
models[model_count()] = model;
|
||||
}
|
||||
|
||||
@@ -895,100 +907,123 @@ void model_init_builtin()
|
||||
{
|
||||
memset(models, 0, sizeof(models));
|
||||
|
||||
pcem_add_model(&m_1);
|
||||
pcem_add_model(&m_2);
|
||||
pcem_add_model(&m_cbmPC10);
|
||||
pcem_add_model(&m_3);
|
||||
pcem_add_model(&m_4);
|
||||
pcem_add_model(&m_5);
|
||||
pcem_add_model(&m_huyndai16t);
|
||||
pcem_add_model(&m_huyndai16te);
|
||||
pcem_add_model(&m_6);
|
||||
pcem_add_model(&m_7);
|
||||
pcem_add_model(&m_8);
|
||||
pcem_add_model(&m_9);
|
||||
pcem_add_model(&m_10);
|
||||
pcem_add_model(&m_11);
|
||||
pcem_add_model(&m_12);
|
||||
pcem_add_model(&m_13);
|
||||
pcem_add_model(&m_14);
|
||||
pcem_add_model(&m_15);
|
||||
pcem_add_model(&m_16);
|
||||
pcem_add_model(&m_17);
|
||||
pcem_add_model(&m_18);
|
||||
pcem_add_model(&m_19);
|
||||
pcem_add_model(&m_20);
|
||||
pcem_add_model(&m_21);
|
||||
pcem_add_model(&m_22);
|
||||
pcem_add_model(&m_23);
|
||||
pcem_add_model(&m_24);
|
||||
pcem_add_model(&m_25);
|
||||
pcem_add_model(&m_26);
|
||||
pcem_add_model(&m_27);
|
||||
pcem_add_model(&m_28);
|
||||
pcem_add_model(&m_29);
|
||||
pcem_add_model(&m_30);
|
||||
pcem_add_model(&m_31);
|
||||
pcem_add_model(&m_32);
|
||||
pcem_add_model(&m_33);
|
||||
pcem_add_model(&m_34);
|
||||
pcem_add_model(&m_35);
|
||||
pcem_add_model(&m_36);
|
||||
pcem_add_model(&m_37);
|
||||
pcem_add_model(&m_38);
|
||||
pcem_add_model(&m_39);
|
||||
pcem_add_model(&m_40);
|
||||
pcem_add_model(&m_41);
|
||||
pcem_add_model(&m_42);
|
||||
pcem_add_model(&m_43);
|
||||
pcem_add_model(&m_44);
|
||||
pcem_add_model(&m_45);
|
||||
pcem_add_model(&m_46);
|
||||
pcem_add_model(&m_47);
|
||||
pcem_add_model(&m_48);
|
||||
pcem_add_model(&m_49);
|
||||
pcem_add_model(&m_50);
|
||||
pcem_add_model(&m_51);
|
||||
pcem_add_model(&m_52);
|
||||
pcem_add_model(&m_53);
|
||||
pcem_add_model(&m_54);
|
||||
pcem_add_model(&m_55);
|
||||
pcem_add_model(&m_56);
|
||||
pcem_add_model(&m_57);
|
||||
pcem_add_model(&m_58);
|
||||
pcem_add_model(&m_59);
|
||||
pcem_add_model(&m_60);
|
||||
pcem_add_model(&m_61);
|
||||
pcem_add_model(&m_62);
|
||||
pcem_add_model(&m_63);
|
||||
pcem_add_model(&m_64);
|
||||
pcem_add_model(&m_65);
|
||||
pcem_add_model(&m_66);
|
||||
pcem_add_model(&m_67);
|
||||
pcem_add_model(&m_68);
|
||||
pcem_add_model(&m_69);
|
||||
pcem_add_model(&m_70);
|
||||
pcem_add_model(&m_71);
|
||||
pcem_add_model(&m_72);
|
||||
pcem_add_model(&m_73);
|
||||
pcem_add_model(&m_74);
|
||||
pcem_add_model(&m_75);
|
||||
pcem_add_model(&m_76);
|
||||
pcem_add_model(&m_77);
|
||||
pcem_add_model(&m_78);
|
||||
pcem_add_model(&m_79);
|
||||
pcem_add_model(&m_80);
|
||||
pcem_add_model(&m_81);
|
||||
pcem_add_model(&m_82);
|
||||
pcem_add_model(&m_83);
|
||||
pcem_add_model(&m_84);
|
||||
pcem_add_model(&m_85);
|
||||
pcem_add_model(&m_86);
|
||||
pcem_add_model(&m_87);
|
||||
pcem_add_model(&m_88);
|
||||
pcem_add_model(&m_89);
|
||||
pcem_add_model(&m_90);
|
||||
pcem_add_model(&m_91);
|
||||
pcem_add_model(&m_92);
|
||||
pcem_add_model(&m_93);
|
||||
/* 8088 PC's */
|
||||
pcem_add_model(&m_amixt);
|
||||
pcem_add_model(&m_ataripc3);
|
||||
pcem_add_model(&m_cbm_pc10);
|
||||
pcem_add_model(&m_compaq_pip);
|
||||
pcem_add_model(&m_dtk);
|
||||
pcem_add_model(&m_genxt);
|
||||
pcem_add_model(&m_hyundaixt);
|
||||
pcem_add_model(&m_hyundaixte);
|
||||
pcem_add_model(&m_ibmpc);
|
||||
pcem_add_model(&m_ibmpcjr);
|
||||
pcem_add_model(&m_ibmxt);
|
||||
pcem_add_model(&m_jukopc);
|
||||
pcem_add_model(&m_ledge_modelm);
|
||||
pcem_add_model(&m_ncr_pc4i);
|
||||
pcem_add_model(&m_pxxt);
|
||||
pcem_add_model(&m_europc);
|
||||
pcem_add_model(&m_tandy);
|
||||
pcem_add_model(&m_tandy1000hx);
|
||||
pcem_add_model(&m_to16_pc);
|
||||
pcem_add_model(&m_t1000);
|
||||
pcem_add_model(&m_ltxt);
|
||||
pcem_add_model(&m_xi8088);
|
||||
pcem_add_model(&m_zdsupers);
|
||||
|
||||
/* 8086 PC's */
|
||||
pcem_add_model(&m_pc1512);
|
||||
pcem_add_model(&m_pc1640);
|
||||
pcem_add_model(&m_pc2086);
|
||||
pcem_add_model(&m_pc3086);
|
||||
pcem_add_model(&m_pc5086);
|
||||
pcem_add_model(&m_ppc512);
|
||||
pcem_add_model(&m_deskpro);
|
||||
pcem_add_model(&m_olivetti_m24);
|
||||
pcem_add_model(&m_pc200);
|
||||
pcem_add_model(&m_tandy1000sl2);
|
||||
pcem_add_model(&m_t1200);
|
||||
pcem_add_model(&m_lxt3);
|
||||
|
||||
/* 286 PC's */
|
||||
pcem_add_model(&m_ami286);
|
||||
pcem_add_model(&m_award286);
|
||||
pcem_add_model(&m_bull_micral_45);
|
||||
pcem_add_model(&m_cmdpc30);
|
||||
pcem_add_model(&m_compaq_pii);
|
||||
pcem_add_model(&m_dells200);
|
||||
pcem_add_model(&m_epson_pcax);
|
||||
pcem_add_model(&m_epson_pcax2e);
|
||||
pcem_add_model(&m_gdc212m);
|
||||
pcem_add_model(&m_gw286ct);
|
||||
pcem_add_model(&m_super286tr);
|
||||
pcem_add_model(&m_ibmat);
|
||||
pcem_add_model(&m_ibmps1es);
|
||||
pcem_add_model(&m_ibmps2_m30_286);
|
||||
pcem_add_model(&m_ibmps2_m50);
|
||||
pcem_add_model(&m_ibmxt286);
|
||||
pcem_add_model(&m_spc4200p);
|
||||
pcem_add_model(&m_spc4216p);
|
||||
pcem_add_model(&m_spc4620p);
|
||||
pcem_add_model(&m_t3100e);
|
||||
pcem_add_model(&m_tg286m);
|
||||
pcem_add_model(&m_tulip_tc7);
|
||||
|
||||
/* 386SX PC's */
|
||||
pcem_add_model(&m_acer386);
|
||||
pcem_add_model(&m_ama932j);
|
||||
pcem_add_model(&m_ami386);
|
||||
pcem_add_model(&m_megapc);
|
||||
pcem_add_model(&m_cbm_sl386sx25);
|
||||
pcem_add_model(&m_dtk386);
|
||||
pcem_add_model(&m_epson_pcax3);
|
||||
pcem_add_model(&m_ibmps1_2121);
|
||||
pcem_add_model(&m_ibmps2_m55sx);
|
||||
pcem_add_model(&m_kmxc02);
|
||||
pcem_add_model(&m_pb_l300sx);
|
||||
pcem_add_model(&m_spc6033p);
|
||||
|
||||
/* 386DX PC's */
|
||||
pcem_add_model(&m_ami386dx);
|
||||
pcem_add_model(&m_deskpro386);
|
||||
pcem_add_model(&m_ecs_386_32);
|
||||
pcem_add_model(&m_ibmps2_m70_type3);
|
||||
pcem_add_model(&m_ibmps2_m80);
|
||||
pcem_add_model(&m_mr386dx);
|
||||
pcem_add_model(&m_spc6000a);
|
||||
|
||||
/* 486 PC's */
|
||||
pcem_add_model(&m_ami486);
|
||||
pcem_add_model(&m_win486);
|
||||
pcem_add_model(&m_sis496);
|
||||
pcem_add_model(&m_elx_pc425x);
|
||||
pcem_add_model(&m_ibmps1_2133);
|
||||
pcem_add_model(&m_ibmps2_m70_type4);
|
||||
pcem_add_model(&m_pb410a);
|
||||
|
||||
/* Socket 4 PC's */
|
||||
pcem_add_model(&m_revenge);
|
||||
pcem_add_model(&m_pb520r);
|
||||
|
||||
/* Socket 5 PC's */
|
||||
pcem_add_model(&m_endeavor);
|
||||
pcem_add_model(&m_zappa);
|
||||
pcem_add_model(&m_infowaym);
|
||||
pcem_add_model(&m_pb570);
|
||||
|
||||
/* Socket 7 PC's */
|
||||
pcem_add_model(&m_p55tvp4);
|
||||
pcem_add_model(&m_p55t2p4);
|
||||
pcem_add_model(&m_p55va);
|
||||
pcem_add_model(&m_430vx);
|
||||
|
||||
/* Super 7 PC's */
|
||||
pcem_add_model(&m_fic_va503p);
|
||||
|
||||
/* Socket 8 PC's */
|
||||
pcem_add_model(&m_vs440fx);
|
||||
|
||||
/* Slot 1 PC's */
|
||||
pcem_add_model(&m_ga686bx);
|
||||
}
|
||||
|
||||
@@ -22,9 +22,9 @@ static int network_card_last = 0;
|
||||
|
||||
NETWORK_CARD *network_cards[NETWORK_CARD_MAX];
|
||||
|
||||
NETWORK_CARD n1 = {"None", "", NULL};
|
||||
NETWORK_CARD n2 = {"Novell NE2000", "ne2000", &ne2000_device};
|
||||
NETWORK_CARD n3 = {"Realtek RTL8029AS", "rtl8029as", &rtl8029as_device};
|
||||
NETWORK_CARD n_none = {"None", "", NULL};
|
||||
NETWORK_CARD n_ne2000 = {"Novell NE2000", "ne2000", &ne2000_device};
|
||||
NETWORK_CARD n_rtl8029as = {"Realtek RTL8029AS", "rtl8029as", &rtl8029as_device};
|
||||
|
||||
int network_card_available(int card)
|
||||
{
|
||||
@@ -131,6 +131,7 @@ int network_card_count()
|
||||
|
||||
void pcem_add_networkcard(NETWORK_CARD *netcard)
|
||||
{
|
||||
//TODO: Add sanity check to not go past MAX amount
|
||||
network_cards[network_card_count()] = netcard;
|
||||
}
|
||||
|
||||
@@ -138,7 +139,7 @@ void network_card_init_builtin()
|
||||
{
|
||||
memset(network_cards, 0, sizeof(network_cards));
|
||||
|
||||
pcem_add_networkcard(&n1);
|
||||
pcem_add_networkcard(&n2);
|
||||
pcem_add_networkcard(&n3);
|
||||
}
|
||||
pcem_add_networkcard(&n_none);
|
||||
pcem_add_networkcard(&n_ne2000);
|
||||
pcem_add_networkcard(&n_rtl8029as);
|
||||
}
|
||||
|
||||
35
src/paths.c
35
src/paths.c
@@ -24,8 +24,11 @@ char configs_path[512];
|
||||
char logs_path[512];
|
||||
/* this is where screenshots as stored */
|
||||
char screenshots_path[512];
|
||||
/* this is where plugins are stored */
|
||||
char plugins_default_path[512];
|
||||
|
||||
char nvr_default_path[512];
|
||||
char base_path[512];
|
||||
|
||||
char get_path_separator()
|
||||
{
|
||||
@@ -117,6 +120,11 @@ void set_screenshots_path(char *s)
|
||||
append_slash(screenshots_path, 512);
|
||||
}
|
||||
|
||||
void set_plugins_path(char *s) {
|
||||
safe_strncpy(plugins_default_path, s, 512);
|
||||
append_slash(plugins_default_path, 512);
|
||||
}
|
||||
|
||||
/* set the default roms paths, this makes them permanent */
|
||||
void set_default_roms_paths(char *s)
|
||||
{
|
||||
@@ -210,7 +218,7 @@ void paths_onconfigloaded()
|
||||
void paths_init()
|
||||
{
|
||||
char s[512];
|
||||
char base_path[512];
|
||||
|
||||
char *p;
|
||||
|
||||
get_pcem_path(pcem_path, 512);
|
||||
@@ -219,19 +227,22 @@ void paths_init()
|
||||
*p=0;
|
||||
|
||||
/* set up default paths for this session */
|
||||
append_filename(s, pcem_path, "roms/", 512);
|
||||
set_roms_paths(s);
|
||||
append_filename(s, pcem_path, "nvr/", 512);
|
||||
set_nvr_path(s);
|
||||
append_filename(s, pcem_path, "configs/", 512);
|
||||
set_configs_path(s);
|
||||
append_filename(s, pcem_path, "screenshots/", 512);
|
||||
set_screenshots_path(s);
|
||||
set_logs_path(pcem_path);
|
||||
|
||||
get_pcem_base_path(base_path, 512);
|
||||
append_filename(s, base_path, "nvr/default/", 512);
|
||||
|
||||
append_filename(s, base_path, "../share/pcem/roms/", 512);
|
||||
set_roms_paths(s);
|
||||
append_filename(s, base_path, "../share/pcem/nvr/", 512);
|
||||
set_nvr_path(s);
|
||||
append_filename(s, base_path, "../share/pcem/configs/", 512);
|
||||
set_configs_path(s);
|
||||
append_filename(s, base_path, "../share/pcem/screenshots/", 512);
|
||||
set_screenshots_path(s);
|
||||
append_filename(s, base_path, "../share/pcem/logs/", 512);
|
||||
set_logs_path(s);
|
||||
append_filename(s, base_path, "../share/pcem/nvr/default/", 512);
|
||||
set_default_nvr_default_path(s);
|
||||
append_filename(s, base_path, "../share/pcem/plugins/", 512);
|
||||
set_plugins_path(s);
|
||||
|
||||
add_config_callback(paths_loadconfig, paths_saveconfig, paths_onconfigloaded);
|
||||
|
||||
|
||||
6
src/plugin.c
Normal file
6
src/plugin.c
Normal file
@@ -0,0 +1,6 @@
|
||||
#include "plugin.h"
|
||||
|
||||
void init_plugin_engine()
|
||||
{
|
||||
|
||||
}
|
||||
@@ -31,25 +31,25 @@ static int sound_card_last = 0;
|
||||
|
||||
SOUND_CARD *sound_cards[256];
|
||||
|
||||
SOUND_CARD sc_1 = {"None", "none", NULL};
|
||||
SOUND_CARD sc_2 = {"Adlib", "adlib", &adlib_device};
|
||||
SOUND_CARD sc_3 = {"Adlib", "adlib_mca", &adlib_mca_device};
|
||||
SOUND_CARD sc_4 = {"Sound Blaster 1.0", "sb", &sb_1_device};
|
||||
SOUND_CARD sc_5 = {"Sound Blaster 1.5", "sb1.5", &sb_15_device};
|
||||
SOUND_CARD sc_6 = {"Sound Blaster MCV", "sbmcv", &sb_mcv_device};
|
||||
SOUND_CARD sc_7 = {"Sound Blaster 2.0", "sb2.0", &sb_2_device};
|
||||
SOUND_CARD sc_8 = {"Sound Blaster Pro v1", "sbprov1", &sb_pro_v1_device};
|
||||
SOUND_CARD sc_9 = {"Sound Blaster Pro v2", "sbprov2", &sb_pro_v2_device};
|
||||
SOUND_CARD sc_10 = {"Sound Blaster Pro MCV", "sbpromcv", &sb_pro_mcv_device};
|
||||
SOUND_CARD sc_11 = {"Sound Blaster 16", "sb16", &sb_16_device};
|
||||
SOUND_CARD sc_12 = {"Sound Blaster AWE32", "sbawe32", &sb_awe32_device};
|
||||
SOUND_CARD sc_13 = {"Adlib Gold", "adlibgold", &adgold_device};
|
||||
SOUND_CARD sc_14 = {"Windows Sound System", "wss", &wss_device};
|
||||
SOUND_CARD sc_15 = {"Aztech Sound Galaxy Pro 16 AB (Washington)", "azt2316a", &azt2316a_device};
|
||||
SOUND_CARD sc_16 = {"Aztech Sound Galaxy Nova 16 Extra (Clinton)", "azt1605", &azt1605_device};
|
||||
SOUND_CARD sc_17 = {"Pro Audio Spectrum 16", "pas16", &pas16_device};
|
||||
SOUND_CARD sc_18 = {"Ensoniq AudioPCI (ES1371)", "es1371", &es1371_device};
|
||||
SOUND_CARD sc_19 = {"Sound Blaster PCI 128", "sbpci128", &es1371_device};
|
||||
SOUND_CARD sc_none = {"None", "none", NULL};
|
||||
SOUND_CARD sc_adlib = {"Adlib", "adlib", &adlib_device};
|
||||
SOUND_CARD sc_adlib_mca = {"Adlib", "adlib_mca", &adlib_mca_device};
|
||||
SOUND_CARD sc_sb = {"Sound Blaster 1.0", "sb", &sb_1_device};
|
||||
SOUND_CARD sc_sb1_5 = {"Sound Blaster 1.5", "sb1.5", &sb_15_device};
|
||||
SOUND_CARD sc_sbmcv = {"Sound Blaster MCV", "sbmcv", &sb_mcv_device};
|
||||
SOUND_CARD sc_sb2_0 = {"Sound Blaster 2.0", "sb2.0", &sb_2_device};
|
||||
SOUND_CARD sc_sbprov1 = {"Sound Blaster Pro v1", "sbprov1", &sb_pro_v1_device};
|
||||
SOUND_CARD sc_sbprov2 = {"Sound Blaster Pro v2", "sbprov2", &sb_pro_v2_device};
|
||||
SOUND_CARD sc_sbpromcv = {"Sound Blaster Pro MCV", "sbpromcv", &sb_pro_mcv_device};
|
||||
SOUND_CARD sc_sb16 = {"Sound Blaster 16", "sb16", &sb_16_device};
|
||||
SOUND_CARD sc_sbawe32 = {"Sound Blaster AWE32", "sbawe32", &sb_awe32_device};
|
||||
SOUND_CARD sc_adlibgold = {"Adlib Gold", "adlibgold", &adgold_device};
|
||||
SOUND_CARD sc_wss = {"Windows Sound System", "wss", &wss_device};
|
||||
SOUND_CARD sc_azt2316a = {"Aztech Sound Galaxy Pro 16 AB (Washington)", "azt2316a", &azt2316a_device};
|
||||
SOUND_CARD sc_azt1605 = {"Aztech Sound Galaxy Nova 16 Extra (Clinton)", "azt1605", &azt1605_device};
|
||||
SOUND_CARD sc_pas16 = {"Pro Audio Spectrum 16", "pas16", &pas16_device};
|
||||
SOUND_CARD sc_es1371 = {"Ensoniq AudioPCI (ES1371)", "es1371", &es1371_device};
|
||||
SOUND_CARD sc_sbpci128 = {"Sound Blaster PCI 128", "sbpci128", &es1371_device};
|
||||
|
||||
int sound_card_available(int card)
|
||||
{
|
||||
@@ -299,6 +299,7 @@ int sound_count()
|
||||
|
||||
void pcem_add_sound(SOUND_CARD *sound)
|
||||
{
|
||||
//TODO: Add sanity check to not go past MAX amount
|
||||
sound_cards[sound_count()] = sound;
|
||||
}
|
||||
|
||||
@@ -306,23 +307,23 @@ void sound_init_builtin()
|
||||
{
|
||||
memset(sound_cards, 0, sizeof(sound_cards));
|
||||
|
||||
pcem_add_sound(&sc_1);
|
||||
pcem_add_sound(&sc_2);
|
||||
pcem_add_sound(&sc_3);
|
||||
pcem_add_sound(&sc_4);
|
||||
pcem_add_sound(&sc_5);
|
||||
pcem_add_sound(&sc_6);
|
||||
pcem_add_sound(&sc_7);
|
||||
pcem_add_sound(&sc_8);
|
||||
pcem_add_sound(&sc_9);
|
||||
pcem_add_sound(&sc_10);
|
||||
pcem_add_sound(&sc_11);
|
||||
pcem_add_sound(&sc_12);
|
||||
pcem_add_sound(&sc_13);
|
||||
pcem_add_sound(&sc_14);
|
||||
pcem_add_sound(&sc_15);
|
||||
pcem_add_sound(&sc_16);
|
||||
pcem_add_sound(&sc_17);
|
||||
pcem_add_sound(&sc_18);
|
||||
pcem_add_sound(&sc_19);
|
||||
}
|
||||
pcem_add_sound(&sc_none);
|
||||
pcem_add_sound(&sc_adlib);
|
||||
pcem_add_sound(&sc_adlib_mca);
|
||||
pcem_add_sound(&sc_sb);
|
||||
pcem_add_sound(&sc_sb1_5);
|
||||
pcem_add_sound(&sc_sbmcv);
|
||||
pcem_add_sound(&sc_sb2_0);
|
||||
pcem_add_sound(&sc_sbprov1);
|
||||
pcem_add_sound(&sc_sbprov2);
|
||||
pcem_add_sound(&sc_sbpromcv);
|
||||
pcem_add_sound(&sc_sb16);
|
||||
pcem_add_sound(&sc_sbawe32);
|
||||
pcem_add_sound(&sc_adlibgold);
|
||||
pcem_add_sound(&sc_wss);
|
||||
pcem_add_sound(&sc_azt2316a);
|
||||
pcem_add_sound(&sc_azt1605);
|
||||
pcem_add_sound(&sc_pas16);
|
||||
pcem_add_sound(&sc_es1371);
|
||||
pcem_add_sound(&sc_sbpci128);
|
||||
}
|
||||
|
||||
@@ -67,56 +67,56 @@ enum
|
||||
|
||||
VIDEO_CARD *video_cards[GFX_MAX];
|
||||
|
||||
VIDEO_CARD v_1 = {"3DFX Voodoo Banshee (reference)", "banshee", &voodoo_banshee_device, GFX_BANSHEE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_2 = {"3DFX Voodoo 3 2000", "v3_2000", &voodoo_3_2000_device, GFX_VOODOO_3_2000, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_3 = {"3DFX Voodoo 3 3000", "v3_3000", &voodoo_3_3000_device, GFX_VOODOO_3_3000, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_4 = {"Acumos AVGA2 / Cirrus Logic CL-GD5402", "avga2", &avga2_device, GFX_AVGA2, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_5 = {"ATI Graphics Pro Turbo (Mach64 GX)", "mach64gx", &mach64gx_device, GFX_MACH64GX, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_6 = {"ATI Video Xpression (Mach64 VT2)", "mach64vt2", &mach64vt2_device, GFX_MACH64VT2, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_7 = {"ATI EGA Wonder 800+ (ATI-18800)", "egawonder800", &ati_ega_wonder_800_device, GFX_EGAWONDER800, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_8 = {"ATI Korean VGA (ATI-28800)", "ati28800k", &ati28800k_device, GFX_ATIKOREANVGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_9 = {"ATI VGA Charger (ATI-28800)", "ati28800", &ati28800_device, GFX_VGACHARGER, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_10 = {"ATI VGA Edge-16 (ATI-18800)", "ati18800", &ati18800_device, GFX_VGAEDGE16, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_11 = {"CGA", "cga", &cga_device, GFX_CGA, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_12 = {"Cirrus Logic CL-GD5428", "cl_gd5428", &gd5428_device, GFX_CL_GD5428, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_13 = {"Cirrus Logic CL-GD5429", "cl_gd5429", &gd5429_device, GFX_CL_GD5429, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_14 = {"Cirrus Logic CL-GD5430", "cl_gd5430", &gd5430_device, GFX_CL_GD5430, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_15 = {"Cirrus Logic CL-GD5434", "cl_gd5434", &gd5434_device, GFX_CL_GD5434, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_16 = {"Compaq CGA", "compaq_cga", &compaq_cga_device, GFX_COMPAQ_CGA, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_17 = {"Creative Labs 3D Blaster Banshee PCI", "cl_banshee", &creative_voodoo_banshee_device, GFX_CL_BANSHEE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_18 = {"Diamond Stealth 32 (Tseng ET4000/w32p)", "stealth32", &et4000w32p_device, GFX_ET4000W32, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 4, 10, 10, 10}};
|
||||
VIDEO_CARD v_19 = {"Diamond Stealth 3D 2000 (S3 ViRGE)", "stealth3d_2000", &s3_virge_device, GFX_VIRGE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 3, 28, 28, 45}};
|
||||
VIDEO_CARD v_20 = {"EGA", "ega", &ega_device, GFX_EGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_21 = {"Hercules", "hercules", &hercules_device, GFX_HERCULES, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_22 = {"Hercules InColor", "incolor", &incolor_device, GFX_INCOLOR, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_23 = {"IBM 1MB SVGA Adapter/A (CL GD5428)", "ibm1mbsvga", &ibm_gd5428_device, GFX_IBM_GD5428, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_24 = {"Image Manager 1024", "im1024", &im1024_device, GFX_IM1024, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_25 = {"Kasan Hangulmadang-16 (Tseng ET4000AX)", "kasan16", &et4000_kasan_device, GFX_KASAN16VGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_26 = {"Matrox Mystique", "mystique", &mystique_device, GFX_MYSTIQUE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 4, 10, 10, 10}};
|
||||
VIDEO_CARD v_27 = {"Matrox Millennium", "millennium", &millennium_device, GFX_MILLENNIUM, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 10, 10, 10}};
|
||||
VIDEO_CARD v_28 = {"MDA", "mda", &mda_device, GFX_MDA, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_29 = {"MDSI Genius", "genius", &genius_device, GFX_GENIUS, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_30 = {"Number Nine 9FX (S3 Trio64)", "n9_9fx", &s3_9fx_device, GFX_N9_9FX, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}};
|
||||
VIDEO_CARD v_31 = {"OAK OTI-037", "oti037", &oti037_device, GFX_OTI037, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 6, 8, 16, 6, 8, 16}};
|
||||
VIDEO_CARD v_32 = {"OAK OTI-067", "oti067", &oti067_device, GFX_OTI067, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 6, 8, 16, 6, 8, 16}};
|
||||
VIDEO_CARD v_33 = {"Olivetti GO481 (Paradise PVGA1A)", "olivetti_go481", ¶dise_pvga1a_oli_go481_device, GFX_OLIVETTI_GO481, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 6, 8, 16, 6, 8, 16}};
|
||||
VIDEO_CARD v_34 = {"Paradise Bahamas 64 (S3 Vision864)", "bahamas64", &s3_bahamas64_device, GFX_BAHAMAS64, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 5, 20, 20, 35}};
|
||||
VIDEO_CARD v_banshee = {"3DFX Voodoo Banshee (reference)", "banshee", &voodoo_banshee_device, GFX_BANSHEE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_v3_2000 = {"3DFX Voodoo 3 2000", "v3_2000", &voodoo_3_2000_device, GFX_VOODOO_3_2000, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_v3_3000 = {"3DFX Voodoo 3 3000", "v3_3000", &voodoo_3_3000_device, GFX_VOODOO_3_3000, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_avga2 = {"Acumos AVGA2 / Cirrus Logic CL-GD5402", "avga2", &avga2_device, GFX_AVGA2, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_mach64gx = {"ATI Graphics Pro Turbo (Mach64 GX)", "mach64gx", &mach64gx_device, GFX_MACH64GX, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_mach64vt2 = {"ATI Video Xpression (Mach64 VT2)", "mach64vt2", &mach64vt2_device, GFX_MACH64VT2, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_egawonder800 = {"ATI EGA Wonder 800+ (ATI-18800)", "egawonder800", &ati_ega_wonder_800_device, GFX_EGAWONDER800, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_ati28800k = {"ATI Korean VGA (ATI-28800)", "ati28800k", &ati28800k_device, GFX_ATIKOREANVGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_ati28800 = {"ATI VGA Charger (ATI-28800)", "ati28800", &ati28800_device, GFX_VGACHARGER, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_ati18800 = {"ATI VGA Edge-16 (ATI-18800)", "ati18800", &ati18800_device, GFX_VGAEDGE16, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_cga = {"CGA", "cga", &cga_device, GFX_CGA, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_cl_gd5428 = {"Cirrus Logic CL-GD5428", "cl_gd5428", &gd5428_device, GFX_CL_GD5428, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_cl_gd5429 = {"Cirrus Logic CL-GD5429", "cl_gd5429", &gd5429_device, GFX_CL_GD5429, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_cl_gd5430 = {"Cirrus Logic CL-GD5430", "cl_gd5430", &gd5430_device, GFX_CL_GD5430, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_cl_gd5434 = {"Cirrus Logic CL-GD5434", "cl_gd5434", &gd5434_device, GFX_CL_GD5434, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_compaq_cga_device = {"Compaq CGA", "compaq_cga", &compaq_cga_device, GFX_COMPAQ_CGA, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_cl_banshee = {"Creative Labs 3D Blaster Banshee PCI", "cl_banshee", &creative_voodoo_banshee_device, GFX_CL_BANSHEE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}};
|
||||
VIDEO_CARD v_stealth32 = {"Diamond Stealth 32 (Tseng ET4000/w32p)", "stealth32", &et4000w32p_device, GFX_ET4000W32, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 4, 10, 10, 10}};
|
||||
VIDEO_CARD v_stealth3d_2000 = {"Diamond Stealth 3D 2000 (S3 ViRGE)", "stealth3d_2000", &s3_virge_device, GFX_VIRGE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 3, 28, 28, 45}};
|
||||
VIDEO_CARD v_ega = {"EGA", "ega", &ega_device, GFX_EGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_hercules = {"Hercules", "hercules", &hercules_device, GFX_HERCULES, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_incolor = {"Hercules InColor", "incolor", &incolor_device, GFX_INCOLOR, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_ibm1mbsvga = {"IBM 1MB SVGA Adapter/A (CL GD5428)", "ibm1mbsvga", &ibm_gd5428_device, GFX_IBM_GD5428, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 8, 10, 10, 20}};
|
||||
VIDEO_CARD v_im1024 = {"Image Manager 1024", "im1024", &im1024_device, GFX_IM1024, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_kasan16 = {"Kasan Hangulmadang-16 (Tseng ET4000AX)", "kasan16", &et4000_kasan_device, GFX_KASAN16VGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_mystique = {"Matrox Mystique", "mystique", &mystique_device, GFX_MYSTIQUE, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 4, 10, 10, 10}};
|
||||
VIDEO_CARD v_millennium = {"Matrox Millennium", "millennium", &millennium_device, GFX_MILLENNIUM, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 1, 10, 10, 10}};
|
||||
VIDEO_CARD v_mda = {"MDA", "mda", &mda_device, GFX_MDA, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_genius = {"MDSI Genius", "genius", &genius_device, GFX_GENIUS, VIDEO_FLAG_TYPE_MDA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_n9_9fx = {"Number Nine 9FX (S3 Trio64)", "n9_9fx", &s3_9fx_device, GFX_N9_9FX, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}};
|
||||
VIDEO_CARD v_oti037 = {"OAK OTI-037", "oti037", &oti037_device, GFX_OTI037, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 6, 8, 16, 6, 8, 16}};
|
||||
VIDEO_CARD v_oti067 = {"OAK OTI-067", "oti067", &oti067_device, GFX_OTI067, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 6, 8, 16, 6, 8, 16}};
|
||||
VIDEO_CARD v_olivetti_go481 = {"Olivetti GO481 (Paradise PVGA1A)", "olivetti_go481", ¶dise_pvga1a_oli_go481_device, GFX_OLIVETTI_GO481, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 6, 8, 16, 6, 8, 16}};
|
||||
VIDEO_CARD v_bahamas64 = {"Paradise Bahamas 64 (S3 Vision864)", "bahamas64", &s3_bahamas64_device, GFX_BAHAMAS64, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 4, 5, 20, 20, 35}};
|
||||
/* Not offered as the emulation is very incomplete
|
||||
VIDEO_CARD v_35 = {"Professional Graphics Controller", "pgc", &pgc_device, GFX_PGC, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_pgc = {"Professional Graphics Controller", "pgc", &pgc_device, GFX_PGC, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
*/
|
||||
VIDEO_CARD v_36 = {"Phoenix S3 Trio32", "px_trio32", &s3_phoenix_trio32_device, GFX_PHOENIX_TRIO32, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}};
|
||||
VIDEO_CARD v_37 = {"Phoenix S3 Trio64", "px_trio64", &s3_phoenix_trio64_device, GFX_PHOENIX_TRIO64, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}};
|
||||
VIDEO_CARD v_38 = {"Plantronics ColorPlus", "plantronics", &colorplus_device, GFX_COLORPLUS, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_39 = {"S3 ViRGE/DX", "virge375", &s3_virge_375_device, GFX_VIRGEDX, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 3, 28, 28, 45}};
|
||||
VIDEO_CARD v_40 = {"Sigma Color 400", "sigma400", &sigma_device, GFX_SIGMA400, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_41 = {"Trident TVGA8900D", "tvga8900d", &tvga8900d_device, GFX_TVGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 8, 8, 12}};
|
||||
VIDEO_CARD v_42 = {"Trident TVGA9000B", "tvga9000b", &tvga9000b_device, GFX_TVGA9000B, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 7, 7, 12, 7, 7, 12}};
|
||||
VIDEO_CARD v_43 = {"Trident TGUI9400CXi", "tgui9400cxi", &tgui9400cxi_device, GFX_TGUI9400CXI, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 8, 16, 4, 8, 16}};
|
||||
VIDEO_CARD v_44 = {"Trident TGUI9440", "tgui9440", &tgui9440_device, GFX_TGUI9440, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 8, 16, 4, 8, 16}};
|
||||
VIDEO_CARD v_45 = {"Trigem Korean VGA (Tseng ET4000AX)", "tgkorvga", &et4000k_device, GFX_TGKOREANVGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_46 = {"Tseng ET4000AX", "et4000ax", &et4000_device, GFX_ET4000, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_47 = {"VGA", "vga", &vga_device, GFX_VGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_48 = {"Wyse 700", "wy700", &wy700_device, GFX_WY700, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_px_trio32 = {"Phoenix S3 Trio32", "px_trio32", &s3_phoenix_trio32_device, GFX_PHOENIX_TRIO32, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}};
|
||||
VIDEO_CARD v_px_trio64 = {"Phoenix S3 Trio64", "px_trio64", &s3_phoenix_trio64_device, GFX_PHOENIX_TRIO64, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}};
|
||||
VIDEO_CARD v_plantronics = {"Plantronics ColorPlus", "plantronics", &colorplus_device, GFX_COLORPLUS, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_virge375 = {"S3 ViRGE/DX", "virge375", &s3_virge_375_device, GFX_VIRGEDX, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 3, 28, 28, 45}};
|
||||
VIDEO_CARD v_sigma400 = {"Sigma Color 400", "sigma400", &sigma_device, GFX_SIGMA400, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_tvga8900d = {"Trident TVGA8900D", "tvga8900d", &tvga8900d_device, GFX_TVGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 8, 8, 12}};
|
||||
VIDEO_CARD v_tvga9000b = {"Trident TVGA9000B", "tvga9000b", &tvga9000b_device, GFX_TVGA9000B, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 7, 7, 12, 7, 7, 12}};
|
||||
VIDEO_CARD v_tgui9400cxi = {"Trident TGUI9400CXi", "tgui9400cxi", &tgui9400cxi_device, GFX_TGUI9400CXI, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 8, 16, 4, 8, 16}};
|
||||
VIDEO_CARD v_tgui9440 = {"Trident TGUI9440", "tgui9440", &tgui9440_device, GFX_TGUI9440, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 8, 16, 4, 8, 16}};
|
||||
VIDEO_CARD v_tgkorvga = {"Trigem Korean VGA (Tseng ET4000AX)", "tgkorvga", &et4000k_device, GFX_TGKOREANVGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_et4000ax = {"Tseng ET4000AX", "et4000ax", &et4000_device, GFX_ET4000, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}};
|
||||
VIDEO_CARD v_vga = {"VGA", "vga", &vga_device, GFX_VGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
VIDEO_CARD v_wy700 = {"Wyse 700", "wy700", &wy700_device, GFX_WY700, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}};
|
||||
|
||||
static video_timings_t timing_dram = {VIDEO_BUS, 0,0,0, 0,0,0}; /*No additional waitstates*/
|
||||
static video_timings_t timing_pc1512 = {VIDEO_BUS, 0,0,0, 0,0,0}; /*PC1512 video code handles waitstates itself*/
|
||||
@@ -1332,6 +1332,7 @@ int video_count()
|
||||
|
||||
void pcem_add_video(VIDEO_CARD *video)
|
||||
{
|
||||
//TODO: Add sanity check to not go past MAX amount
|
||||
video_cards[video_count()] = video;
|
||||
}
|
||||
|
||||
@@ -1339,51 +1340,54 @@ void video_init_builtin()
|
||||
{
|
||||
memset(video_cards, 0, sizeof(video_cards));
|
||||
|
||||
pcem_add_video(&v_1);
|
||||
pcem_add_video(&v_2);
|
||||
pcem_add_video(&v_3);
|
||||
pcem_add_video(&v_4);
|
||||
pcem_add_video(&v_5);
|
||||
pcem_add_video(&v_6);
|
||||
pcem_add_video(&v_7);
|
||||
pcem_add_video(&v_8);
|
||||
pcem_add_video(&v_9);
|
||||
pcem_add_video(&v_10);
|
||||
pcem_add_video(&v_11);
|
||||
pcem_add_video(&v_12);
|
||||
pcem_add_video(&v_13);
|
||||
pcem_add_video(&v_14);
|
||||
pcem_add_video(&v_15);
|
||||
pcem_add_video(&v_16);
|
||||
pcem_add_video(&v_17);
|
||||
pcem_add_video(&v_18);
|
||||
pcem_add_video(&v_19);
|
||||
pcem_add_video(&v_20);
|
||||
pcem_add_video(&v_21);
|
||||
pcem_add_video(&v_22);
|
||||
pcem_add_video(&v_23);
|
||||
pcem_add_video(&v_24);
|
||||
pcem_add_video(&v_25);
|
||||
pcem_add_video(&v_26);
|
||||
pcem_add_video(&v_27);
|
||||
pcem_add_video(&v_28);
|
||||
pcem_add_video(&v_29);
|
||||
pcem_add_video(&v_30);
|
||||
pcem_add_video(&v_31);
|
||||
pcem_add_video(&v_32);
|
||||
pcem_add_video(&v_33);
|
||||
pcem_add_video(&v_34);
|
||||
pcem_add_video(&v_36);
|
||||
pcem_add_video(&v_37);
|
||||
pcem_add_video(&v_38);
|
||||
pcem_add_video(&v_39);
|
||||
pcem_add_video(&v_40);
|
||||
pcem_add_video(&v_41);
|
||||
pcem_add_video(&v_42);
|
||||
pcem_add_video(&v_43);
|
||||
pcem_add_video(&v_44);
|
||||
pcem_add_video(&v_45);
|
||||
pcem_add_video(&v_46);
|
||||
pcem_add_video(&v_47);
|
||||
pcem_add_video(&v_48);
|
||||
pcem_add_video(&v_banshee);
|
||||
pcem_add_video(&v_v3_2000);
|
||||
pcem_add_video(&v_v3_3000);
|
||||
pcem_add_video(&v_avga2);
|
||||
pcem_add_video(&v_mach64gx);
|
||||
pcem_add_video(&v_mach64vt2);
|
||||
pcem_add_video(&v_egawonder800);
|
||||
pcem_add_video(&v_ati28800k);
|
||||
pcem_add_video(&v_ati28800);
|
||||
pcem_add_video(&v_ati18800);
|
||||
pcem_add_video(&v_cga);
|
||||
pcem_add_video(&v_cl_gd5428);
|
||||
pcem_add_video(&v_cl_gd5429);
|
||||
pcem_add_video(&v_cl_gd5430);
|
||||
pcem_add_video(&v_cl_gd5434);
|
||||
pcem_add_video(&v_compaq_cga_device);
|
||||
pcem_add_video(&v_cl_banshee);
|
||||
pcem_add_video(&v_stealth32);
|
||||
pcem_add_video(&v_stealth3d_2000);
|
||||
pcem_add_video(&v_ega);
|
||||
pcem_add_video(&v_hercules);
|
||||
pcem_add_video(&v_incolor);
|
||||
pcem_add_video(&v_ibm1mbsvga);
|
||||
pcem_add_video(&v_im1024);
|
||||
pcem_add_video(&v_kasan16);
|
||||
pcem_add_video(&v_mystique);
|
||||
pcem_add_video(&v_millennium);
|
||||
pcem_add_video(&v_mda);
|
||||
pcem_add_video(&v_genius);
|
||||
pcem_add_video(&v_n9_9fx);
|
||||
pcem_add_video(&v_oti037);
|
||||
pcem_add_video(&v_oti067);
|
||||
pcem_add_video(&v_olivetti_go481);
|
||||
pcem_add_video(&v_bahamas64);
|
||||
/* Not offered as the emulation is very incomplete
|
||||
pcem_add_video(&v_pgc);
|
||||
*/
|
||||
pcem_add_video(&v_px_trio32);
|
||||
pcem_add_video(&v_px_trio64);
|
||||
pcem_add_video(&v_plantronics);
|
||||
pcem_add_video(&v_virge375);
|
||||
pcem_add_video(&v_sigma400);
|
||||
pcem_add_video(&v_tvga8900d);
|
||||
pcem_add_video(&v_tvga9000b);
|
||||
pcem_add_video(&v_tgui9400cxi);
|
||||
pcem_add_video(&v_tgui9440);
|
||||
pcem_add_video(&v_tgkorvga);
|
||||
pcem_add_video(&v_et4000ax);
|
||||
pcem_add_video(&v_vga);
|
||||
pcem_add_video(&v_wy700);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#undef BITMAP
|
||||
#endif
|
||||
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
@@ -67,14 +66,13 @@ extern void creatediscimage_open(void *hwnd);
|
||||
|
||||
uint64_t timer_freq;
|
||||
|
||||
|
||||
int gfx_present[GFX_MAX];
|
||||
|
||||
SDL_mutex* ghMutex;
|
||||
SDL_mutex* mainMutex;
|
||||
SDL_cond* mainCond;
|
||||
SDL_mutex *ghMutex;
|
||||
SDL_mutex *mainMutex;
|
||||
SDL_cond *mainCond;
|
||||
|
||||
SDL_Thread* mainthreadh = NULL;
|
||||
SDL_Thread *mainthreadh = NULL;
|
||||
|
||||
SDL_TimerID onesectimer;
|
||||
|
||||
@@ -87,9 +85,9 @@ int quited = 0;
|
||||
|
||||
SDL_Rect oldclip;
|
||||
|
||||
void* ghwnd = 0;
|
||||
void *ghwnd = 0;
|
||||
|
||||
void* menu;
|
||||
void *menu;
|
||||
|
||||
emulation_state_t emulation_state = EMULATION_STOPPED;
|
||||
int pause = 0;
|
||||
@@ -111,10 +109,10 @@ int video_height = 480;
|
||||
|
||||
char menuitem[60];
|
||||
|
||||
extern int config_selection_open(void* hwnd, int inited);
|
||||
extern int shader_manager_open(void* hwnd);
|
||||
extern int config_selection_open(void *hwnd, int inited);
|
||||
extern int shader_manager_open(void *hwnd);
|
||||
|
||||
extern void sdl_set_window_title(const char* title);
|
||||
extern void sdl_set_window_title(const char *title);
|
||||
|
||||
extern float gl3_shader_refresh_rate;
|
||||
extern float gl3_input_scale;
|
||||
@@ -182,7 +180,7 @@ void toggle_fullscreen()
|
||||
|
||||
uint64_t main_time;
|
||||
|
||||
int mainthread(void* param)
|
||||
int mainthread(void *param)
|
||||
{
|
||||
SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
|
||||
|
||||
@@ -235,7 +233,7 @@ void stop_emulation_now(void)
|
||||
wx_stop_emulation_now(ghwnd);
|
||||
}
|
||||
|
||||
int dir_exists(char* path)
|
||||
int dir_exists(char *path)
|
||||
{
|
||||
return wx_dir_exists(path);
|
||||
}
|
||||
@@ -255,19 +253,19 @@ void get_pcem_path(char *s, int size)
|
||||
|
||||
// create ~/Library/Application Support/PCem/
|
||||
// if it doesn't exist
|
||||
if (stat(s, &st) == -1)
|
||||
if (stat(s, &st) == -1)
|
||||
{
|
||||
mkdir(s, 0700);
|
||||
}
|
||||
#else
|
||||
char* path = SDL_GetBasePath();
|
||||
char *path = SDL_GetBasePath();
|
||||
strcpy(s, path);
|
||||
#endif
|
||||
}
|
||||
|
||||
void get_pcem_base_path(char *s, int size)
|
||||
{
|
||||
char* path = SDL_GetBasePath();
|
||||
char *path = SDL_GetBasePath();
|
||||
strcpy(s, path);
|
||||
}
|
||||
|
||||
@@ -283,10 +281,10 @@ float flash_func(float x)
|
||||
|
||||
float flash_failed_func(float x)
|
||||
{
|
||||
return fabs(sin(x*3.1415926*2));
|
||||
return fabs(sin(x * 3.1415926 * 2));
|
||||
}
|
||||
|
||||
void screenshot_taken(unsigned char* rgb, int width, int height)
|
||||
void screenshot_taken(unsigned char *rgb, int width, int height)
|
||||
{
|
||||
char name[512];
|
||||
char date[128];
|
||||
@@ -312,7 +310,7 @@ uint64_t timer_read()
|
||||
return SDL_GetPerformanceCounter();
|
||||
}
|
||||
|
||||
Uint32 timer_onesec(Uint32 interval, void* param)
|
||||
Uint32 timer_onesec(Uint32 interval, void *param)
|
||||
{
|
||||
onesec();
|
||||
return interval;
|
||||
@@ -374,7 +372,7 @@ void sdl_saveconfig()
|
||||
config_set_int(CFG_MACHINE, "SDL2", "vsync", video_vsync);
|
||||
config_set_int(CFG_MACHINE, "SDL2", "focus_dim", video_focus_dim);
|
||||
config_set_int(CFG_MACHINE, "SDL2", "alternative_update_lock", video_alternative_update_lock);
|
||||
config_set_string(CFG_MACHINE, "SDL2", "render_driver", (char*)requested_render_driver.sdl_id);
|
||||
config_set_string(CFG_MACHINE, "SDL2", "render_driver", (char *)requested_render_driver.sdl_id);
|
||||
|
||||
config_set_float(CFG_MACHINE, "GL3", "input_scale", gl3_input_scale);
|
||||
config_set_int(CFG_MACHINE, "GL3", "input_stretch", gl3_input_stretch);
|
||||
@@ -393,12 +391,12 @@ void sdl_saveconfig()
|
||||
config_set_int(CFG_MACHINE, "GL3 Shaders", "shaders", i);
|
||||
}
|
||||
|
||||
void update_cdrom_menu(void* hmenu)
|
||||
void update_cdrom_menu(void *hmenu)
|
||||
{
|
||||
if (cdrom_drive == CDROM_IMAGE)
|
||||
wx_checkmenuitem(menu, WX_ID("IDM_CDROM_IMAGE"), WX_MB_CHECKED);
|
||||
else if (cdrom_drive > 0)
|
||||
wx_checkmenuitem(menu, IDM_CDROM_REAL+cdrom_drive, WX_MB_CHECKED);
|
||||
wx_checkmenuitem(menu, IDM_CDROM_REAL + cdrom_drive, WX_MB_CHECKED);
|
||||
else
|
||||
wx_checkmenuitem(menu, WX_ID("IDM_CDROM_EMPTY"), WX_MB_CHECKED);
|
||||
}
|
||||
@@ -407,48 +405,48 @@ void wx_initmenu()
|
||||
{
|
||||
menu = wx_getmenu(ghwnd);
|
||||
|
||||
void* cdrom_submenu = wx_getsubmenu(menu, WX_ID("IDM_CDROM"));
|
||||
void *cdrom_submenu = wx_getsubmenu(menu, WX_ID("IDM_CDROM"));
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
char s[32];
|
||||
int c;
|
||||
/* Loop through each Windows drive letter and test to see if
|
||||
it's a CDROM */
|
||||
for (c='A';c<='Z';c++)
|
||||
for (c = 'A'; c <= 'Z'; c++)
|
||||
{
|
||||
sprintf(s,"%c:\\",c);
|
||||
if (GetDriveTypeA(s)==DRIVE_CDROM)
|
||||
sprintf(s, "%c:\\", c);
|
||||
if (GetDriveTypeA(s) == DRIVE_CDROM)
|
||||
{
|
||||
sprintf(s, "Host CD/DVD Drive (%c:)", c);
|
||||
wx_appendmenu(cdrom_submenu, IDM_CDROM_REAL+c, s, wxITEM_RADIO);
|
||||
wx_appendmenu(cdrom_submenu, IDM_CDROM_REAL + c, s, wxITEM_RADIO);
|
||||
}
|
||||
}
|
||||
#elif __linux__
|
||||
wx_appendmenu(cdrom_submenu, IDM_CDROM_REAL+1, "Host CD/DVD Drive (/dev/cdrom)", wxITEM_RADIO);
|
||||
wx_appendmenu(cdrom_submenu, IDM_CDROM_REAL + 1, "Host CD/DVD Drive (/dev/cdrom)", wxITEM_RADIO);
|
||||
#elif __APPLE__
|
||||
int c;
|
||||
|
||||
|
||||
for (c = 1; c < 99; c++)
|
||||
{
|
||||
char s[80];
|
||||
int fd;
|
||||
|
||||
|
||||
sprintf(s, "disk%i", c);
|
||||
fd = opendev(s, O_RDONLY, 0, NULL);
|
||||
if (fd > 0)
|
||||
{
|
||||
char name[255];
|
||||
|
||||
|
||||
close(fd);
|
||||
|
||||
|
||||
sprintf(name, "Host CD/DVD Drive (/dev/disk%i)", c);
|
||||
wx_appendmenu(cdrom_submenu, IDM_CDROM_REAL+c, name, wxITEM_RADIO);
|
||||
wx_appendmenu(cdrom_submenu, IDM_CDROM_REAL + c, name, wxITEM_RADIO);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
int wx_setupmenu(void* data)
|
||||
int wx_setupmenu(void *data)
|
||||
{
|
||||
int c;
|
||||
update_cdrom_menu(menu);
|
||||
@@ -459,10 +457,10 @@ int wx_setupmenu(void* data)
|
||||
wx_checkmenuitem(menu, WX_ID(menuitem), WX_MB_CHECKED);
|
||||
wx_checkmenuitem(menu, WX_ID("IDM_VID_FULLSCREEN"), video_fullscreen);
|
||||
wx_checkmenuitem(menu, WX_ID("IDM_VID_REMEMBER"),
|
||||
window_remember ? WX_MB_CHECKED : WX_MB_UNCHECKED);
|
||||
window_remember ? WX_MB_CHECKED : WX_MB_UNCHECKED);
|
||||
wx_checkmenuitem(menu, WX_ID("IDM_BPB_DISABLE"), bpb_disable ? WX_MB_CHECKED : WX_MB_UNCHECKED);
|
||||
|
||||
sprintf(menuitem, "IDM_SND_BUF[%d]", (int)(log(sound_buf_len/MIN_SND_BUF)/log(2)));
|
||||
sprintf(menuitem, "IDM_SND_BUF[%d]", (int)(log(sound_buf_len / MIN_SND_BUF) / log(2)));
|
||||
wx_checkmenuitem(menu, WX_ID(menuitem), WX_MB_CHECKED);
|
||||
|
||||
sprintf(menuitem, "IDM_SND_GAIN[%d]", (int)(sound_gain / 2));
|
||||
@@ -490,7 +488,7 @@ int wx_setupmenu(void* data)
|
||||
wx_checkmenuitem(menu, WX_ID("IDM_SCREENSHOT_FLASH"), screenshot_flash);
|
||||
|
||||
int num_renderers;
|
||||
sdl_render_driver* drivers = sdl_get_render_drivers(&num_renderers);
|
||||
sdl_render_driver *drivers = sdl_get_render_drivers(&num_renderers);
|
||||
for (c = 1; c < num_renderers; ++c)
|
||||
{
|
||||
sprintf(menuitem, "IDM_VID_RENDER_DRIVER[%d]", drivers[c].id);
|
||||
@@ -499,12 +497,12 @@ int wx_setupmenu(void* data)
|
||||
sprintf(menuitem, "IDM_VID_RENDER_DRIVER[%d]", requested_render_driver.id);
|
||||
wx_checkmenuitem(menu, WX_ID(menuitem), WX_MB_CHECKED);
|
||||
|
||||
// wx_enablemenuitem(menu, WX_ID("IDM_VID_SDL2"), requested_render_driver.id != RENDERER_GL3);
|
||||
// wx_enablemenuitem(menu, WX_ID("IDM_VID_SDL2"), requested_render_driver.id != RENDERER_GL3);
|
||||
wx_enablemenuitem(menu, WX_ID("IDM_VID_GL3"), requested_render_driver.id == RENDERER_GL3);
|
||||
|
||||
sprintf(menuitem, "IDM_VID_GL3_INPUT_STRETCH[%d]", gl3_input_stretch);
|
||||
wx_checkmenuitem(menu, WX_ID(menuitem), WX_MB_CHECKED);
|
||||
sprintf(menuitem, "IDM_VID_GL3_INPUT_SCALE[%d]", (int)((gl3_input_scale-0.5)*2));
|
||||
sprintf(menuitem, "IDM_VID_GL3_INPUT_SCALE[%d]", (int)((gl3_input_scale - 0.5) * 2));
|
||||
wx_checkmenuitem(menu, WX_ID(menuitem), WX_MB_CHECKED);
|
||||
sprintf(menuitem, "IDM_VID_GL3_SHADER_REFRESH_RATE[%g]", gl3_shader_refresh_rate);
|
||||
wx_checkmenuitem(menu, WX_ID(menuitem), WX_MB_CHECKED);
|
||||
@@ -531,7 +529,7 @@ void sdl_onconfigloaded()
|
||||
extern void wx_loadconfig();
|
||||
extern void wx_saveconfig();
|
||||
|
||||
int pc_main(int argc, char** argv)
|
||||
int pc_main(int argc, char **argv)
|
||||
{
|
||||
paths_init();
|
||||
|
||||
@@ -539,7 +537,9 @@ int pc_main(int argc, char** argv)
|
||||
video_init_builtin();
|
||||
sound_init_builtin();
|
||||
hdd_controller_init_builtin();
|
||||
#ifdef USE_NETWORKING
|
||||
network_card_init_builtin();
|
||||
#endif
|
||||
|
||||
#ifdef __linux__
|
||||
char s[1024];
|
||||
@@ -548,7 +548,7 @@ int pc_main(int argc, char** argv)
|
||||
return FALSE;
|
||||
|
||||
/* set up default paths */
|
||||
sprintf(s, "%s%s%c%s", pcem_path, "roms/", get_path_separator(), "/usr/share/pcem/roms/");
|
||||
sprintf(s, "%s%s%c%s%s", pcem_path, "roms/", get_path_separator(), base_path, "../share/pcem/roms/");
|
||||
set_default_roms_paths(s);
|
||||
append_filename(s, pcem_path, "nvr/", 511);
|
||||
set_default_nvr_path(s);
|
||||
@@ -584,7 +584,7 @@ int pc_main(int argc, char** argv)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
int wx_load_config(void* hwnd)
|
||||
int wx_load_config(void *hwnd)
|
||||
{
|
||||
if (!config_override)
|
||||
{
|
||||
@@ -595,7 +595,7 @@ int wx_load_config(void* hwnd)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
int wx_start(void* hwnd)
|
||||
int wx_start(void *hwnd)
|
||||
{
|
||||
int c, d;
|
||||
ghwnd = hwnd;
|
||||
@@ -626,8 +626,8 @@ int wx_start(void* hwnd)
|
||||
if (c == ROM_MAX)
|
||||
{
|
||||
wx_messagebox(hwnd,
|
||||
"No ROMs present!\nYou must have at least one romset to use PCem.",
|
||||
"PCem fatal error", WX_MB_OK);
|
||||
"No ROMs present!\nYou must have at least one romset to use PCem.",
|
||||
"PCem fatal error", WX_MB_OK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -649,7 +649,7 @@ int resume_emulation()
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
int start_emulation(void* params)
|
||||
int start_emulation(void *params)
|
||||
{
|
||||
if (resume_emulation())
|
||||
return TRUE;
|
||||
@@ -668,8 +668,8 @@ int start_emulation(void* params)
|
||||
{
|
||||
if (romset != -1)
|
||||
wx_messagebox(ghwnd,
|
||||
"Configured romset not available.\nDefaulting to available romset.",
|
||||
"PCem error", WX_MB_OK);
|
||||
"Configured romset not available.\nDefaulting to available romset.",
|
||||
"PCem error", WX_MB_OK);
|
||||
for (c = 0; c < ROM_MAX; c++)
|
||||
{
|
||||
if (romspresent[c])
|
||||
@@ -685,8 +685,8 @@ int start_emulation(void* params)
|
||||
{
|
||||
if (romset != -1)
|
||||
wx_messagebox(ghwnd,
|
||||
"Configured video BIOS not available.\nDefaulting to available romset.",
|
||||
"PCem error", WX_MB_OK);
|
||||
"Configured video BIOS not available.\nDefaulting to available romset.",
|
||||
"PCem error", WX_MB_OK);
|
||||
for (c = GFX_MAX - 1; c >= 0; c--)
|
||||
{
|
||||
if (gfx_present[c])
|
||||
@@ -697,7 +697,6 @@ int start_emulation(void* params)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
loadbios();
|
||||
resetpchard();
|
||||
midi_init();
|
||||
@@ -753,7 +752,7 @@ int stop_emulation()
|
||||
|
||||
device_close_all();
|
||||
midi_close();
|
||||
|
||||
|
||||
pclog("Emulation stopped.\n");
|
||||
|
||||
wx_close_status(ghwnd);
|
||||
@@ -781,7 +780,7 @@ int wx_stop()
|
||||
}
|
||||
|
||||
char openfilestring[260];
|
||||
int getfile(void* hwnd, char *f, char *fn)
|
||||
int getfile(void *hwnd, char *f, char *fn)
|
||||
{
|
||||
int ret = wx_filedialog(hwnd, "Open", fn, f, 0, 1, openfilestring);
|
||||
#ifdef __APPLE__
|
||||
@@ -791,7 +790,7 @@ int getfile(void* hwnd, char *f, char *fn)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int getsfile(void* hwnd, char *f, char *fn, char *dir, char *ext)
|
||||
int getsfile(void *hwnd, char *f, char *fn, char *dir, char *ext)
|
||||
{
|
||||
int ret = wx_filedialog(hwnd, "Save", dir, f, ext, 0, openfilestring);
|
||||
#ifdef __APPLE__
|
||||
@@ -800,7 +799,7 @@ int getsfile(void* hwnd, char *f, char *fn, char *dir, char *ext)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int getfilewithcaption(void* hwnd, char *f, char *fn, char *caption)
|
||||
int getfilewithcaption(void *hwnd, char *f, char *fn, char *caption)
|
||||
{
|
||||
int ret = wx_filedialog(hwnd, caption, fn, f, 0, 1, openfilestring);
|
||||
#ifdef __APPLE__
|
||||
@@ -823,39 +822,38 @@ void atapi_close(void)
|
||||
}
|
||||
}
|
||||
|
||||
int custom_resolution_callback(void* window, int message, INT_PARAM wParam, LONG_PARAM lParam)
|
||||
int custom_resolution_callback(void *window, int message, INT_PARAM wParam, LONG_PARAM lParam)
|
||||
{
|
||||
switch (message)
|
||||
{
|
||||
case WX_INITDIALOG:
|
||||
case WX_INITDIALOG:
|
||||
{
|
||||
wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_WIDTH")), WX_UDM_SETPOS, 0, custom_resolution_width);
|
||||
wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_HEIGHT")), WX_UDM_SETPOS, 0, custom_resolution_height);
|
||||
return TRUE;
|
||||
}
|
||||
case WX_COMMAND:
|
||||
{
|
||||
if (wParam == wxID_OK)
|
||||
{
|
||||
wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_WIDTH")), WX_UDM_SETPOS, 0, custom_resolution_width);
|
||||
wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_HEIGHT")), WX_UDM_SETPOS, 0, custom_resolution_height);
|
||||
custom_resolution_width = wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_WIDTH")), WX_UDM_GETPOS, 0, 0);
|
||||
custom_resolution_height = wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_HEIGHT")), WX_UDM_GETPOS, 0, 0);
|
||||
wx_enddialog(window, 1);
|
||||
return TRUE;
|
||||
}
|
||||
case WX_COMMAND:
|
||||
else if (wParam == wxID_CANCEL)
|
||||
{
|
||||
if (wParam == wxID_OK)
|
||||
{
|
||||
custom_resolution_width = wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_WIDTH")), WX_UDM_GETPOS, 0, 0);
|
||||
custom_resolution_height = wx_sendmessage(wx_getdlgitem(window, wx_xrcid("IDC_HEIGHT")), WX_UDM_GETPOS, 0, 0);
|
||||
wx_enddialog(window, 1);
|
||||
return TRUE;
|
||||
}
|
||||
else if (wParam == wxID_CANCEL)
|
||||
{
|
||||
wx_enddialog(window, 0);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
wx_enddialog(window, 0);
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
int wx_handle_command(void *hwnd, int wParam, int checked)
|
||||
{
|
||||
void* hmenu;
|
||||
void *hmenu;
|
||||
char temp_image_path[1024];
|
||||
int new_cdrom_drive;
|
||||
hmenu = wx_getmenu(hwnd);
|
||||
@@ -890,14 +888,14 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
}
|
||||
else if (ID_IS("IDM_FILE_EXIT"))
|
||||
{
|
||||
// wx_exit(hwnd, 0);
|
||||
// wx_exit(hwnd, 0);
|
||||
wx_stop_emulation(hwnd);
|
||||
}
|
||||
else if (ID_IS("IDM_DISC_A"))
|
||||
{
|
||||
if (!getfile(hwnd,
|
||||
"Disc image (*.img;*.ima;*.fdi)|*.img;*.ima;*.fdi|All files (*.*)|*.*",
|
||||
discfns[0]))
|
||||
"Disc image (*.img;*.ima;*.fdi)|*.img;*.ima;*.fdi|All files (*.*)|*.*",
|
||||
discfns[0]))
|
||||
{
|
||||
disc_close(0);
|
||||
disc_load(0, openfilestring);
|
||||
@@ -907,8 +905,8 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
else if (ID_IS("IDM_DISC_B"))
|
||||
{
|
||||
if (!getfile(hwnd,
|
||||
"Disc image (*.img;*.ima;*.fdi)|*.img;*.ima;*.fdi|All files (*.*)|*.*",
|
||||
discfns[1]))
|
||||
"Disc image (*.img;*.ima;*.fdi)|*.img;*.ima;*.fdi|All files (*.*)|*.*",
|
||||
discfns[1]))
|
||||
{
|
||||
disc_close(1);
|
||||
disc_load(1, openfilestring);
|
||||
@@ -938,10 +936,10 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
else if (ID_IS("IDM_DISC_ZIP"))
|
||||
{
|
||||
char zip_fn[256] = "";
|
||||
|
||||
|
||||
if (!getfile(hwnd,
|
||||
"Disc image (*.img)|*.img|All files (*.*)|*.*",
|
||||
zip_fn))
|
||||
"Disc image (*.img)|*.img|All files (*.*)|*.*",
|
||||
zip_fn))
|
||||
{
|
||||
zip_load(openfilestring);
|
||||
}
|
||||
@@ -953,19 +951,19 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
else if (ID_IS("IDM_CASSETTE_LOAD"))
|
||||
{
|
||||
if (!getfile(hwnd,
|
||||
"Tape image (*.pzxi;*.pzx)|*.pzxi;*.pzx|All files (*.*)|*.*",
|
||||
cassettefn))
|
||||
"Tape image (*.pzxi;*.pzx)|*.pzxi;*.pzx|All files (*.*)|*.*",
|
||||
cassettefn))
|
||||
{
|
||||
cassette_eject();
|
||||
cassette_load(openfilestring);
|
||||
saveconfig(NULL);
|
||||
}
|
||||
}
|
||||
else if (ID_IS("IDM_CASSETTE_EJECT"))
|
||||
{
|
||||
cassette_eject();
|
||||
else if (ID_IS("IDM_CASSETTE_EJECT"))
|
||||
{
|
||||
cassette_eject();
|
||||
saveconfig(NULL);
|
||||
}
|
||||
}
|
||||
else if (ID_IS("IDM_MACHINE_TOGGLE"))
|
||||
{
|
||||
if (emulation_state != EMULATION_STOPPED)
|
||||
@@ -1020,7 +1018,7 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
{
|
||||
window_remember = !window_remember;
|
||||
wx_checkmenuitem(hmenu, WX_ID("IDM_VID_REMEMBER"),
|
||||
window_remember ? WX_MB_CHECKED : WX_MB_UNCHECKED);
|
||||
window_remember ? WX_MB_CHECKED : WX_MB_UNCHECKED);
|
||||
window_doremember = 1;
|
||||
saveconfig(NULL);
|
||||
}
|
||||
@@ -1030,8 +1028,8 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
{
|
||||
video_fullscreen_first = 0;
|
||||
wx_messagebox(hwnd,
|
||||
"Use CTRL + ALT + PAGE DOWN to return to windowed mode",
|
||||
"PCem", WX_MB_OK);
|
||||
"Use CTRL + ALT + PAGE DOWN to return to windowed mode",
|
||||
"PCem", WX_MB_OK);
|
||||
}
|
||||
video_fullscreen = !video_fullscreen;
|
||||
wx_checkmenuitem(hmenu, wParam, video_fullscreen);
|
||||
@@ -1074,7 +1072,7 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
window_doreset = 1;
|
||||
|
||||
/* update enabled menu-items */
|
||||
// wx_enablemenuitem(menu, WX_ID("IDM_VID_SDL2"), requested_render_driver.id != RENDERER_GL3);
|
||||
// wx_enablemenuitem(menu, WX_ID("IDM_VID_SDL2"), requested_render_driver.id != RENDERER_GL3);
|
||||
wx_enablemenuitem(menu, WX_ID("IDM_VID_GL3"), requested_render_driver.id == RENDERER_GL3);
|
||||
|
||||
wx_checkmenuitem(hmenu, wParam, WX_MB_CHECKED);
|
||||
@@ -1109,7 +1107,7 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
else if (ID_RANGE("IDM_VID_GL3_INPUT_SCALE[start]", "IDM_VID_GL3_INPUT_SCALE[end]"))
|
||||
{
|
||||
int input_scale = wParam - wx_xrcid("IDM_VID_GL3_INPUT_SCALE[start]");
|
||||
gl3_input_scale = input_scale/2.0f+0.5f;
|
||||
gl3_input_scale = input_scale / 2.0f + 0.5f;
|
||||
wx_checkmenuitem(menu, wParam, WX_MB_CHECKED);
|
||||
saveconfig(NULL);
|
||||
}
|
||||
@@ -1126,18 +1124,17 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
renderer_doreset = 1;
|
||||
saveconfig(NULL);
|
||||
}
|
||||
// if (!getfile(hwnd, "GLSL Shaders (*.glslp;*.glsl)|*.glslp;*.glsl|All files (*.*)|*.*", gl3_shader_file))
|
||||
// {
|
||||
// strncpy(gl3_shader_file, openfilestring, 511);
|
||||
// gl3_shader_file[511] = 0;
|
||||
// renderer_doreset = 1;
|
||||
// saveconfig(NULL);
|
||||
// }
|
||||
|
||||
// if (!getfile(hwnd, "GLSL Shaders (*.glslp;*.glsl)|*.glslp;*.glsl|All files (*.*)|*.*", gl3_shader_file))
|
||||
// {
|
||||
// strncpy(gl3_shader_file, openfilestring, 511);
|
||||
// gl3_shader_file[511] = 0;
|
||||
// renderer_doreset = 1;
|
||||
// saveconfig(NULL);
|
||||
// }
|
||||
}
|
||||
else if (ID_RANGE("IDM_SND_BUF[start]", "IDM_SND_BUF[end]"))
|
||||
{
|
||||
sound_buf_len = MIN_SND_BUF*1<<(wParam - wx_xrcid("IDM_SND_BUF[start]"));
|
||||
sound_buf_len = MIN_SND_BUF * 1 << (wParam - wx_xrcid("IDM_SND_BUF[start]"));
|
||||
wx_checkmenuitem(menu, wParam, WX_MB_CHECKED);
|
||||
saveconfig(NULL);
|
||||
}
|
||||
@@ -1166,13 +1163,12 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
else if (ID_IS("IDM_CDROM_IMAGE") || ID_IS("IDM_CDROM_IMAGE_LOAD"))
|
||||
{
|
||||
if (!getfile(hwnd,
|
||||
"CD-ROM image (*.iso;*.cue)|*.iso;*.cue|All files (*.*)|*.*",
|
||||
image_path))
|
||||
"CD-ROM image (*.iso;*.cue)|*.iso;*.cue|All files (*.*)|*.*",
|
||||
image_path))
|
||||
{
|
||||
old_cdrom_drive = cdrom_drive;
|
||||
strcpy(temp_image_path, openfilestring);
|
||||
if ((strcmp(image_path, temp_image_path) == 0)
|
||||
&& (cdrom_drive == CDROM_IMAGE))
|
||||
if ((strcmp(image_path, temp_image_path) == 0) && (cdrom_drive == CDROM_IMAGE))
|
||||
{
|
||||
/* Switching from ISO to the same ISO. Do nothing. */
|
||||
update_cdrom_menu(hmenu);
|
||||
@@ -1184,12 +1180,13 @@ int wx_handle_command(void* hwnd, int wParam, int checked)
|
||||
cdrom_drive = CDROM_IMAGE;
|
||||
saveconfig(NULL);
|
||||
update_cdrom_menu(hmenu);
|
||||
} else
|
||||
}
|
||||
else
|
||||
update_cdrom_menu(hmenu);
|
||||
}
|
||||
else if (wParam >= IDM_CDROM_REAL && wParam < IDM_CDROM_REAL+100)
|
||||
else if (wParam >= IDM_CDROM_REAL && wParam < IDM_CDROM_REAL + 100)
|
||||
{
|
||||
new_cdrom_drive = wParam-IDM_CDROM_REAL;
|
||||
new_cdrom_drive = wParam - IDM_CDROM_REAL;
|
||||
if (cdrom_drive == new_cdrom_drive)
|
||||
{
|
||||
/* Switching to the same drive. Do nothing. */
|
||||
|
||||
Reference in New Issue
Block a user