claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quaternary IDE controller now works properly;

Browse Source 
Significantly cleaned up ide.c;
Made disc_img.c actually compile again.
This commit is contained in:
OBattler
2016-12-29 20:40:24 +01:00
parent c8b57ccbe2
commit 03ee24cc6c
5 changed files with 1834 additions and 2066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/disc_img.c
View File

@@ -349,9 +349,9 @@ void img_load(int drive, char *fn)
{ {
rep_byte = fgetc(img[drive].f); rep_byte = fgetc(img[drive].f);
block_len = -block_len; block_len = -block_len;
if (img[drive].cqm_data + cur_pos + block_len) > ((uint32_t) bpb_total) * ((uint32_t) bpb_bps)) if ((cur_pos + block_len) > ((uint32_t) bpb_total) * ((uint32_t) bpb_bps))
{ {
block_len = ((uint32_t) bpb_total) * ((uint32_t) bpb_bps) - (img[drive].cqm_data + cur_pos); block_len = ((uint32_t) bpb_total) * ((uint32_t) bpb_bps) - cur_pos;
memset(img[drive].cqm_data + cur_pos, rep_byte, block_len); memset(img[drive].cqm_data + cur_pos, rep_byte, block_len);
break; break;
} }
@@ -363,9 +363,9 @@ void img_load(int drive, char *fn)
} }
else if (block_len > 0) else if (block_len > 0)
{ {
if (img[drive].cqm_data + cur_pos + block_len) > ((uint32_t) bpb_total) * ((uint32_t) bpb_bps)) if ((cur_pos + block_len) > ((uint32_t) bpb_total) * ((uint32_t) bpb_bps))
{ {
block_len = ((uint32_t) bpb_total) * ((uint32_t) bpb_bps) - (img[drive].cqm_data + cur_pos); block_len = ((uint32_t) bpb_total) * ((uint32_t) bpb_bps) - cur_pos;
fread(img[drive].cqm_data + cur_pos, 1, block_len, img[drive].f); fread(img[drive].cqm_data + cur_pos, 1, block_len, img[drive].f);
break; break;
} }

1106
src/ide.c
View File

File diff suppressed because it is too large Load Diff

4
src/ide.h
View File

@@ -27,8 +27,8 @@ extern void ide_set_bus_master(int (*read_sector)(int channel, uint8_t *data), i
extern int ideboard; extern int ideboard;
extern int ide34_enable[2]; extern int ide_enable[4];
extern int ide34_irq[2]; extern int ide_irq[4];
extern int idecallback[4]; extern int idecallback[4];

20
src/pc.c
View File

@@ -406,12 +406,12 @@ void resetpchard()
ide_ter_disable(); ide_ter_disable();
ide_qua_disable(); ide_qua_disable();
if (ide34_enable[0]) if (ide_enable[2])
{ {
ide_ter_init(); ide_ter_init();
} }
if (ide34_enable[1]) if (ide_enable[3])
{ {
ide_qua_init(); ide_qua_init();
} }
@@ -761,10 +761,10 @@ void loadconfig(char *fn)
if (p) strcpy(ide_fn[7], p); if (p) strcpy(ide_fn[7], p);
else strcpy(ide_fn[7], ""); else strcpy(ide_fn[7], "");
ide34_enable[0] = config_get_int(NULL, "ide_ter_enable", 0); ide_enable[2] = config_get_int(NULL, "ide_ter_enable", 0);
ide34_irq[0] = config_get_int(NULL, "ide_ter_irq", 10); ide_irq[2] = config_get_int(NULL, "ide_ter_irq", 10);
ide34_enable[1] = config_get_int(NULL, "ide_qua_enable", 0); ide_enable[3] = config_get_int(NULL, "ide_qua_enable", 0);
ide34_irq[1] = config_get_int(NULL, "ide_qua_irq", 11); ide_irq[3] = config_get_int(NULL, "ide_qua_irq", 11);
fdd_set_type(0, config_get_int(NULL, "drive_a_type", 1)); fdd_set_type(0, config_get_int(NULL, "drive_a_type", 1));
fdd_set_type(1, config_get_int(NULL, "drive_b_type", 1)); fdd_set_type(1, config_get_int(NULL, "drive_b_type", 1));
@@ -920,10 +920,10 @@ void saveconfig()
config_set_int(NULL, "hdj_cylinders", hdc[7].tracks); config_set_int(NULL, "hdj_cylinders", hdc[7].tracks);
config_set_string(NULL, "hdj_fn", ide_fn[7]); config_set_string(NULL, "hdj_fn", ide_fn[7]);
config_set_int(NULL, "ide_ter_enable", ide34_enable[0]); config_set_int(NULL, "ide_ter_enable", ide_enable[2]);
config_set_int(NULL, "ide_ter_irq", ide34_irq[0]); config_set_int(NULL, "ide_ter_irq", ide_irq[2]);
config_set_int(NULL, "ide_qua_enable", ide34_enable[1]); config_set_int(NULL, "ide_qua_enable", ide_enable[3]);
config_set_int(NULL, "ide_qua_irq", ide34_irq[1]); config_set_int(NULL, "ide_qua_irq", ide_irq[3]);
config_set_int(NULL, "drive_a_type", fdd_get_type(0)); config_set_int(NULL, "drive_a_type", fdd_get_type(0));
config_set_int(NULL, "drive_b_type", fdd_get_type(1)); config_set_int(NULL, "drive_b_type", fdd_get_type(1));

68
src/win.c
View File

@@ -627,7 +627,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
if (scsi_cdrom_enabled) if (scsi_cdrom_enabled)
CheckMenuItem(menu, IDM_CDROM_SCSI, MF_CHECKED); CheckMenuItem(menu, IDM_CDROM_SCSI, MF_CHECKED);
if (ide34_enable[0]) if (ide_enable[2])
CheckMenuItem(menu, IDM_IDE_TER_ENABLED, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_TER_ENABLED, MF_CHECKED);
CheckMenuItem(menu, IDM_IDE_TER_IRQ9, MF_UNCHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ9, MF_UNCHECKED);
@@ -637,27 +637,27 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
CheckMenuItem(menu, IDM_IDE_TER_IRQ14, MF_UNCHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ14, MF_UNCHECKED);
CheckMenuItem(menu, IDM_IDE_TER_IRQ15, MF_UNCHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ15, MF_UNCHECKED);
if (ide34_irq[0] == 9) if (ide_irq[2] == 9)
{ {
CheckMenuItem(menu, IDM_IDE_TER_IRQ9, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ9, MF_CHECKED);
} }
else if (ide34_irq[0] == 10) else if (ide_irq[2] == 10)
{ {
CheckMenuItem(menu, IDM_IDE_TER_IRQ10, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ10, MF_CHECKED);
} }
else if (ide34_irq[0] == 11) else if (ide_irq[2] == 11)
{ {
CheckMenuItem(menu, IDM_IDE_TER_IRQ11, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ11, MF_CHECKED);
} }
else if (ide34_irq[0] == 12) else if (ide_irq[2] == 12)
{ {
CheckMenuItem(menu, IDM_IDE_TER_IRQ12, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ12, MF_CHECKED);
} }
else if (ide34_irq[0] == 14) else if (ide_irq[2] == 14)
{ {
CheckMenuItem(menu, IDM_IDE_TER_IRQ14, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ14, MF_CHECKED);
} }
else if (ide34_irq[0] == 15) else if (ide_irq[2] == 15)
{ {
CheckMenuItem(menu, IDM_IDE_TER_IRQ15, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_TER_IRQ15, MF_CHECKED);
} }
@@ -666,7 +666,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
fatal("Unrecognized tertiary IDE controller IRQ\n"); fatal("Unrecognized tertiary IDE controller IRQ\n");
} }
if (ide34_enable[1]) if (ide_enable[3])
CheckMenuItem(menu, IDM_IDE_QUA_ENABLED, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_QUA_ENABLED, MF_CHECKED);
CheckMenuItem(menu, IDM_IDE_QUA_IRQ9, MF_UNCHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ9, MF_UNCHECKED);
@@ -676,27 +676,27 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
CheckMenuItem(menu, IDM_IDE_QUA_IRQ14, MF_UNCHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ14, MF_UNCHECKED);
CheckMenuItem(menu, IDM_IDE_QUA_IRQ15, MF_UNCHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ15, MF_UNCHECKED);
if (ide34_irq[1] == 9) if (ide_irq[3] == 9)
{ {
CheckMenuItem(menu, IDM_IDE_QUA_IRQ9, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ9, MF_CHECKED);
} }
else if (ide34_irq[1] == 10) else if (ide_irq[3] == 10)
{ {
CheckMenuItem(menu, IDM_IDE_QUA_IRQ10, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ10, MF_CHECKED);
} }
else if (ide34_irq[1] == 11) else if (ide_irq[3] == 11)
{ {
CheckMenuItem(menu, IDM_IDE_QUA_IRQ11, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ11, MF_CHECKED);
} }
else if (ide34_irq[1] == 12) else if (ide_irq[3] == 12)
{ {
CheckMenuItem(menu, IDM_IDE_QUA_IRQ12, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ12, MF_CHECKED);
} }
else if (ide34_irq[1] == 14) else if (ide_irq[3] == 14)
{ {
CheckMenuItem(menu, IDM_IDE_QUA_IRQ14, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ14, MF_CHECKED);
} }
else if (ide34_irq[1] == 15) else if (ide_irq[3] == 15)
{ {
CheckMenuItem(menu, IDM_IDE_QUA_IRQ15, MF_CHECKED); CheckMenuItem(menu, IDM_IDE_QUA_IRQ15, MF_CHECKED);
} }
@@ -1142,7 +1142,7 @@ char *floppy_image_extensions = "All floppy images (*.001;*.002;*.003;*.004;*.00
int ide_ter_set_irq(HMENU hmenu, int irq, int id) int ide_ter_set_irq(HMENU hmenu, int irq, int id)
{ {
if (ide34_irq[0] == irq) if (ide_irq[2] == irq)
{ {
return 0; return 0;
} }
@@ -1152,7 +1152,7 @@ int ide_ter_set_irq(HMENU hmenu, int irq, int id)
} }
pause = 1; pause = 1;
Sleep(100); Sleep(100);
ide34_irq[0] = irq; ide_irq[2] = irq;
CheckMenuItem(hmenu, IDM_IDE_TER_IRQ9, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_TER_IRQ9, MF_UNCHECKED);
CheckMenuItem(hmenu, IDM_IDE_TER_IRQ10, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_TER_IRQ10, MF_UNCHECKED);
CheckMenuItem(hmenu, IDM_IDE_TER_IRQ11, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_TER_IRQ11, MF_UNCHECKED);
@@ -1168,7 +1168,7 @@ int ide_ter_set_irq(HMENU hmenu, int irq, int id)
int ide_qua_set_irq(HMENU hmenu, int irq, int id) int ide_qua_set_irq(HMENU hmenu, int irq, int id)
{ {
if (ide34_irq[1] == irq) if (ide_irq[3] == irq)
{ {
return 0; return 0;
} }
@@ -1178,7 +1178,7 @@ int ide_qua_set_irq(HMENU hmenu, int irq, int id)
} }
pause = 1; pause = 1;
Sleep(100); Sleep(100);
ide34_irq[1] = irq; ide_irq[3] = irq;
CheckMenuItem(hmenu, IDM_IDE_QUA_IRQ9, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_QUA_IRQ9, MF_UNCHECKED);
CheckMenuItem(hmenu, IDM_IDE_QUA_IRQ10, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_QUA_IRQ10, MF_UNCHECKED);
CheckMenuItem(hmenu, IDM_IDE_QUA_IRQ11, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_QUA_IRQ11, MF_UNCHECKED);
@@ -1560,35 +1560,35 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
} }
pause = 1; pause = 1;
Sleep(100); Sleep(100);
ide34_enable[0] ^= 1; ide_enable[2] ^= 1;
CheckMenuItem(hmenu, IDM_SCSI_ENABLED, ide34_enable[0] ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_TER_ENABLED, ide_enable[2] ? MF_CHECKED : MF_UNCHECKED);
saveconfig(); saveconfig();
resetpchard(); resetpchard();
pause = 0; pause = 0;
break; break;
case IDM_IDE_TER_IRQ9: case IDM_IDE_TER_IRQ9:
ide_ter_set_irq(hmenu, 9, IDM_SCSI_IRQ9); ide_ter_set_irq(hmenu, 9, IDM_IDE_TER_IRQ9);
break; break;
case IDM_IDE_TER_IRQ10: case IDM_IDE_TER_IRQ10:
ide_ter_set_irq(hmenu, 10, IDM_SCSI_IRQ10); ide_ter_set_irq(hmenu, 10, IDM_IDE_TER_IRQ10);
break; break;
case IDM_IDE_TER_IRQ11: case IDM_IDE_TER_IRQ11:
ide_ter_set_irq(hmenu, 11, IDM_SCSI_IRQ11); ide_ter_set_irq(hmenu, 11, IDM_IDE_TER_IRQ11);
break; break;
case IDM_IDE_TER_IRQ12: case IDM_IDE_TER_IRQ12:
ide_ter_set_irq(hmenu, 12, IDM_SCSI_IRQ12); ide_ter_set_irq(hmenu, 12, IDM_IDE_TER_IRQ12);
break; break;
case IDM_IDE_TER_IRQ14: case IDM_IDE_TER_IRQ14:
ide_ter_set_irq(hmenu, 14, IDM_SCSI_IRQ14); ide_ter_set_irq(hmenu, 14, IDM_IDE_TER_IRQ14);
break; break;
case IDM_IDE_TER_IRQ15: case IDM_IDE_TER_IRQ15:
ide_ter_set_irq(hmenu, 15, IDM_SCSI_IRQ15); ide_ter_set_irq(hmenu, 15, IDM_IDE_TER_IRQ15);
break; break;
case IDM_IDE_QUA_ENABLED: case IDM_IDE_QUA_ENABLED:
@@ -1598,35 +1598,35 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
} }
pause = 1; pause = 1;
Sleep(100); Sleep(100);
ide34_enable[1] ^= 1; ide_enable[3] ^= 1;
CheckMenuItem(hmenu, IDM_SCSI_ENABLED, ide34_enable[1] ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hmenu, IDM_IDE_QUA_ENABLED, ide_enable[3] ? MF_CHECKED : MF_UNCHECKED);
saveconfig(); saveconfig();
resetpchard(); resetpchard();
pause = 0; pause = 0;
break; break;
case IDM_IDE_QUA_IRQ9: case IDM_IDE_QUA_IRQ9:
ide_qua_set_irq(hmenu, 9, IDM_SCSI_IRQ9); ide_qua_set_irq(hmenu, 9, IDM_IDE_QUA_IRQ9);
break; break;
case IDM_IDE_QUA_IRQ10: case IDM_IDE_QUA_IRQ10:
ide_qua_set_irq(hmenu, 10, IDM_SCSI_IRQ10); ide_qua_set_irq(hmenu, 10, IDM_IDE_QUA_IRQ10);
break; break;
case IDM_IDE_QUA_IRQ11: case IDM_IDE_QUA_IRQ11:
ide_qua_set_irq(hmenu, 11, IDM_SCSI_IRQ11); ide_qua_set_irq(hmenu, 11, IDM_IDE_QUA_IRQ11);
break; break;
case IDM_IDE_QUA_IRQ12: case IDM_IDE_QUA_IRQ12:
ide_qua_set_irq(hmenu, 12, IDM_SCSI_IRQ12); ide_qua_set_irq(hmenu, 12, IDM_IDE_QUA_IRQ12);
break; break;
case IDM_IDE_QUA_IRQ14: case IDM_IDE_QUA_IRQ14:
ide_qua_set_irq(hmenu, 14, IDM_SCSI_IRQ14); ide_qua_set_irq(hmenu, 14, IDM_IDE_QUA_IRQ14);
break; break;
case IDM_IDE_QUA_IRQ15: case IDM_IDE_QUA_IRQ15:
ide_qua_set_irq(hmenu, 15, IDM_SCSI_IRQ15); ide_qua_set_irq(hmenu, 15, IDM_IDE_QUA_IRQ15);
break; break;
case IDM_SCSI_ENABLED: case IDM_SCSI_ENABLED: