diff --git a/src/Makefile.mingw b/src/Makefile.mingw index e6923b4..a68bb4c 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -3,7 +3,7 @@ CPP = g++.exe CC = gcc.exe WINDRES = windres.exe CFLAGS = -O3 -march=i686 -fomit-frame-pointer -OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad.o cdrom-ioctl.o \ +OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad.o cdrom-ioctl.o cdrom-iso.o \ codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_pentium.o codegen_x86.o compaq.o config.o cpu.o dac.o \ device.o disc.o disc_fdi.o disc_img.o disc_sector.o dma.o fdc.o fdc37c665.o fdd.o fdi2raw.o gameport.o headland.o i430lx.o i430fx.o \ i430vx.o ide.o intel.o intel_flash.o io.o jim.o keyboard.o keyboard_amstrad.o keyboard_at.o \ diff --git a/src/cdrom-ioctl.c b/src/cdrom-ioctl.c index 51b9dbf..fcccd7d 100644 --- a/src/cdrom-ioctl.c +++ b/src/cdrom-ioctl.c @@ -531,13 +531,18 @@ int ioctl_open(char d) { ioctl_inited=1; CloseHandle(hIOCTL); + hIOCTL = NULL; } return 0; } static void ioctl_close(void) { - CloseHandle(hIOCTL); + if (hIOCTL) + { + CloseHandle(hIOCTL); + hIOCTL = NULL; + } } static void ioctl_exit(void) @@ -545,6 +550,7 @@ static void ioctl_exit(void) ioctl_stop(); ioctl_inited=0; tocvalid=0; + ioctl_close(); } static ATAPI ioctl_atapi= diff --git a/src/cdrom-iso.c b/src/cdrom-iso.c new file mode 100644 index 0000000..f6c0106 --- /dev/null +++ b/src/cdrom-iso.c @@ -0,0 +1,248 @@ +/*ISO CD-ROM support*/ + +#include "ibm.h" +#include "ide.h" +#include "cdrom-iso.h" +#include + +static ATAPI iso_atapi; + +static uint32_t last_block = 0; +static uint64_t image_size = 0; +static int iso_inited = 0; +char iso_path[1024]; +static FILE *iso_image = NULL; +static int iso_changed = 0; + +static uint32_t iso_cd_pos = 0, iso_cd_end = 0; + +void iso_audio_callback(int16_t *output, int len) +{ + memset(output, 0, len * 2); + return; +} + +void iso_audio_stop() +{ + pclog("iso_audio_stop stub\n"); +} + +static int get_track_nr(uint32_t pos) +{ + pclog("get_track_nr stub\n"); + return 0; +} + +static void iso_playaudio(uint32_t pos, uint32_t len, int ismsf) +{ + pclog("iso_playaudio stub\n"); + return; +} + +static void iso_pause(void) +{ + pclog("iso_pause stub\n"); + return; +} + +static void iso_resume(void) +{ + pclog("iso_resume stub\n"); + return; +} + +static void iso_stop(void) +{ + pclog("iso_stop stub\n"); + return; +} + +static void iso_seek(uint32_t pos) +{ + pclog("iso_seek stub\n"); + return; +} + +static int iso_ready(void) +{ + if (iso_changed) + { + iso_changed = 0; + return 0; + } + + return 1; +} + +static uint8_t iso_getcurrentsubchannel(uint8_t *b, int msf) +{ + pclog("iso_getcurrentsubchannel stub\n"); + return 0; +} + +static void iso_eject(void) +{ + pclog("iso_eject stub\n"); +} + +static void iso_load(void) +{ + pclog("iso_load stub\n"); +} + +static void iso_readsector(uint8_t *b, int sector) +{ + if (!cdrom_drive) return; + fseek(iso_image,sector*2048,SEEK_SET); + fread(b,2048,1,iso_image); +} + +static void lba_to_msf(uint8_t *buf, int lba) +{ + lba += 150; + buf[0] = (lba / 75) / 60; + buf[1] = (lba / 75) % 60; + buf[2] = lba & 75; +} + +static int iso_readtoc(unsigned char *buf, unsigned char start_track, int msf, int maxlen, int single) +{ + uint8_t *q; + int len; + + if (start_track > 1 && start_track != 0xaa) + return -1; + q = buf + 2; + *q++ = 1; /* first session */ + *q++ = 1; /* last session */ + if (start_track <= 1) + { + *q++ = 0; /* reserved */ + *q++ = 0x14; /* ADR, control */ + *q++ = 1; /* track number */ + *q++ = 0; /* reserved */ + if (msf) + { + *q++ = 0; /* reserved */ + lba_to_msf(q, 0); + q += 3; + } + else + { + /* sector 0 */ + *q++ = 0; + *q++ = 0; + *q++ = 0; + *q++ = 0; + } + } + /* lead out track */ + *q++ = 0; /* reserved */ + *q++ = 0x16; /* ADR, control */ + *q++ = 0xaa; /* track number */ + *q++ = 0; /* reserved */ + last_block = image_size >> 11; + if (msf) + { + *q++ = 0; /* reserved */ + lba_to_msf(q, last_block); + q += 3; + } + else + { + *q++ = last_block >> 24; + *q++ = last_block >> 16; + *q++ = last_block >> 8; + *q++ = last_block; + } + len = q - buf; + buf[0] = (uint8_t)(((len-2) >> 8) & 0xff); + buf[1] = (uint8_t)((len-2) & 0xff); + return len; +} + +static void iso_readtoc_session(unsigned char *buf, int msf, int maxlen) +{ + uint8_t *q; + + q = buf + 2; + *q++ = 1; /* first session */ + *q++ = 1; /* last session */ + + *q++ = 1; /* session number */ + *q++ = 0x14; /* data track */ + *q++ = 0; /* track number */ + *q++ = 0xa0; /* lead-in */ + *q++ = 0; /* min */ + *q++ = 0; /* sec */ + *q++ = 0; /* frame */ + *q++ = 0; +} + +static uint32_t iso_size() +{ + unsigned char b[4096]; + + atapi->readtoc(b, 0, 0, 4096, 0); + + return last_block; +} + +void iso_reset() +{ +} + +int iso_open(char *fn) +{ + struct stat st; + + if (iso_image) + fclose(iso_image); + + iso_changed = 1; + + sprintf(iso_path, "%s", fn); + pclog("Path is %s\n", iso_path); + + iso_image = fopen(iso_path, "rb"); + atapi = &iso_atapi; + + stat(iso_path, &st); + image_size = st.st_size; + + return 0; +} + +static void iso_close(void) +{ + if (iso_image) + { + fclose(iso_image); + iso_image = NULL; + } +} + +static void iso_exit(void) +{ + iso_stop(); + iso_inited = 0; + iso_close(); +} + +static ATAPI iso_atapi = +{ + iso_ready, + iso_readtoc, + iso_readtoc_session, + iso_getcurrentsubchannel, + iso_readsector, + iso_playaudio, + iso_seek, + iso_load, + iso_eject, + iso_pause, + iso_resume, + iso_size, + iso_stop, + iso_exit +}; diff --git a/src/cdrom-iso.h b/src/cdrom-iso.h new file mode 100644 index 0000000..04352cd --- /dev/null +++ b/src/cdrom-iso.h @@ -0,0 +1,14 @@ +#ifndef CDROM_ISO_H +#define CDROM_ISO_H + +/* this header file lists the functions provided by + various platform specific cdrom-ioctl files */ + +extern char iso_path[1024]; + +extern int iso_open(char *fn); +extern void iso_reset(); + +#define CDROM_ISO 200 + +#endif /* ! CDROM_ISO_H */ diff --git a/src/pc.c b/src/pc.c index 28943b1..e07ddd1 100644 --- a/src/pc.c +++ b/src/pc.c @@ -7,6 +7,7 @@ #include "ali1429.h" #include "amstrad.h" #include "cdrom-ioctl.h" +#include "cdrom-iso.h" #include "disc.h" #include "mem.h" #include "x86_ops.h" @@ -272,7 +273,16 @@ void initpc(int argc, char *argv[]) cdrom_null_open(cdrom_drive); else #endif - ioctl_open(cdrom_drive); + { + if (cdrom_drive == CDROM_ISO) + { + iso_open(iso_path); + } + else + { + ioctl_open(cdrom_drive); + } + } pit_reset(); /* if (romset==ROM_AMI386 || romset==ROM_AMI486) */fullspeed(); @@ -286,7 +296,16 @@ void initpc(int argc, char *argv[]) cdrom_null_reset(); else #endif - ioctl_reset(); + { + if (cdrom_drive == CDROM_ISO) + { + iso_reset(); + } + else + { + ioctl_reset(); + } + } } void resetpc() @@ -356,7 +375,16 @@ void resetpchard() cdrom_null_reset(); else #endif - ioctl_reset(); + { + if (cdrom_drive == CDROM_ISO) + { + iso_reset(); + } + else + { + ioctl_reset(); + } + } } char romsets[17][40]={"IBM PC","IBM XT","Generic Turbo XT","Euro PC","Tandy 1000","Amstrad PC1512","Sinclair PC200","Amstrad PC1640","IBM AT","AMI 286 clone","Dell System 200","Misc 286","IBM AT 386","Misc 386","386 clone","486 clone","486 clone 2"}; @@ -562,6 +590,10 @@ void loadconfig(char *fn) cdrom_drive = config_get_int(NULL, "cdrom_drive", 0); cdrom_enabled = config_get_int(NULL, "cdrom_enabled", 0); + + p = (char *)config_get_string(NULL, "cdrom_path", ""); + if (p) strcpy(iso_path, p); + else strcpy(iso_path, ""); slowega = config_get_int(NULL, "slow_video", 1); cache = config_get_int(NULL, "cache", 3); @@ -626,6 +658,7 @@ void saveconfig() config_set_int(NULL, "mem_size", mem_size); config_set_int(NULL, "cdrom_drive", cdrom_drive); config_set_int(NULL, "cdrom_enabled", cdrom_enabled); + config_set_string(NULL, "cdrom_path", iso_path); config_set_int(NULL, "vid_resize", vid_resize); config_set_int(NULL, "vid_api", vid_api); config_set_int(NULL, "video_fullscreen_scale", video_fullscreen_scale); diff --git a/src/pc.rc b/src/pc.rc index 9caf24c..523313d 100644 --- a/src/pc.rc +++ b/src/pc.rc @@ -28,6 +28,7 @@ BEGIN BEGIN MENUITEM "&Disabled", IDM_CDROM_DISABLED MENUITEM "&Empty",IDM_CDROM_EMPTY + MENUITEM "&ISO...",IDM_CDROM_ISO END POPUP "&Video" BEGIN diff --git a/src/resources.h b/src/resources.h index a988c60..ddd3a43 100644 --- a/src/resources.h +++ b/src/resources.h @@ -22,6 +22,7 @@ #define IDM_CDROM_EMPTY 40100 #define IDM_CDROM_REAL 40100 #define IDM_CDROM_DISABLED 40200 +#define IDM_CDROM_ISO 40201 #define IDC_COMBO1 1000 #define IDC_COMBOVID 1001 diff --git a/src/win.c b/src/win.c index dd4cf26..ab04582 100644 --- a/src/win.c +++ b/src/win.c @@ -14,6 +14,8 @@ #include #include #include "ibm.h" +#include "cdrom-ioctl.h" +#include "cdrom-iso.h" #include "config.h" #include "video.h" #include "resources.h" @@ -552,8 +554,13 @@ int WINAPI WinMain (HINSTANCE hThisInstance, if (!cdrom_enabled) CheckMenuItem(menu, IDM_CDROM_DISABLED, MF_CHECKED); - else - CheckMenuItem(menu, IDM_CDROM_REAL + cdrom_drive, MF_CHECKED); + else + { + if (cdrom_drive == CDROM_ISO) + CheckMenuItem(menu, IDM_CDROM_ISO, MF_CHECKED); + else + CheckMenuItem(menu, IDM_CDROM_REAL + cdrom_drive, MF_CHECKED); + } if (vid_resize) CheckMenuItem(menu, IDM_VID_RESIZE, MF_CHECKED); CheckMenuItem(menu, IDM_VID_DDRAW + vid_api, MF_CHECKED); CheckMenuItem(menu, IDM_VID_FS_FULL + video_fullscreen_scale, MF_CHECKED); @@ -827,6 +834,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM { HMENU hmenu; RECT rect; + char temp_iso_path[1024]; // pclog("Message %i %08X\n",message,message); switch (message) { @@ -973,9 +981,11 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM if (MessageBox(NULL,"This will reset PCem!\nOkay to continue?","PCem",MB_OKCANCEL) != IDOK) break; } + atapi->exit(); CheckMenuItem(hmenu, IDM_CDROM_REAL + cdrom_drive, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_CDROM_DISABLED, MF_CHECKED); CheckMenuItem(hmenu, IDM_CDROM_EMPTY, MF_UNCHECKED); + CheckMenuItem(hmenu, IDM_CDROM_ISO, MF_UNCHECKED); if (cdrom_enabled) { pause = 1; @@ -997,6 +1007,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM ioctl_open(0); CheckMenuItem(hmenu, IDM_CDROM_REAL + cdrom_drive, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_CDROM_DISABLED, MF_UNCHECKED); + CheckMenuItem(hmenu, IDM_CDROM_ISO, MF_UNCHECKED); cdrom_drive=0; CheckMenuItem(hmenu, IDM_CDROM_EMPTY, MF_CHECKED); saveconfig(); @@ -1010,6 +1021,36 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM pause = 0; } break; + + case IDM_CDROM_ISO: + if (!getfile(hwnd,"CD-ROM image (*.ISO)\0*.ISO\0All files (*.*)\0*.*\0",iso_path)) + { + if (!cdrom_enabled) + { + if (MessageBox(NULL,"This will reset PCem!\nOkay to continue?","PCem",MB_OKCANCEL) != IDOK) + break; + } + atapi->exit(); + strcpy(temp_iso_path, openfilestring); + CheckMenuItem(hmenu, IDM_CDROM_REAL + cdrom_drive, MF_UNCHECKED); + CheckMenuItem(hmenu, IDM_CDROM_DISABLED, MF_UNCHECKED); + CheckMenuItem(hmenu, IDM_CDROM_ISO, MF_UNCHECKED); + cdrom_drive = CDROM_ISO; + iso_open(temp_iso_path); + CheckMenuItem(hmenu, IDM_CDROM_ISO, MF_CHECKED); + saveconfig(); + if (!cdrom_enabled) + { + pause = 1; + Sleep(100); + cdrom_enabled = 1; + saveconfig(); + resetpchard(); + pause = 0; + } + } + break; + default: if (LOWORD(wParam)>=IDM_CDROM_REAL && LOWORD(wParam)<(IDM_CDROM_REAL+100)) { @@ -1022,6 +1063,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM ioctl_open(LOWORD(wParam)-IDM_CDROM_REAL); CheckMenuItem(hmenu, IDM_CDROM_REAL + cdrom_drive, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_CDROM_DISABLED, MF_UNCHECKED); + CheckMenuItem(hmenu, IDM_CDROM_ISO, MF_UNCHECKED); cdrom_drive = LOWORD(wParam) - IDM_CDROM_REAL; CheckMenuItem(hmenu, IDM_CDROM_REAL + cdrom_drive, MF_CHECKED); saveconfig();