--- hatari/src/gui-sdl/dlgHardDisk.c 2019/04/09 08:55:55 1.1.1.5 +++ hatari/src/gui-sdl/dlgHardDisk.c 2019/04/09 08:59:37 1.1.1.7 @@ -14,65 +14,102 @@ const char DlgHardDisk_fileid[] = "Hatar #include "file.h" -#define DISKDLG_ACSIEJECT 3 -#define DISKDLG_ACSIBROWSE 4 -#define DISKDLG_ACSINAME 5 -#define DISKDLG_IDEMASTEREJECT 7 -#define DISKDLG_IDEMASTERBROWSE 8 -#define DISKDLG_IDEMASTERNAME 9 -#define DISKDLG_IDESLAVEEJECT 11 -#define DISKDLG_IDESLAVEBROWSE 12 -#define DISKDLG_IDESLAVENAME 13 -#define DISKDLG_GEMDOSEJECT 15 -#define DISKDLG_GEMDOSBROWSE 16 -#define DISKDLG_GEMDOSNAME 17 -#define DISKDLG_GEMDOSCONV 18 -#define DISKDLG_DRIVESKIP 19 -#define DISKDLG_PROTOFF 21 -#define DISKDLG_PROTON 22 -#define DISKDLG_PROTAUTO 23 -#define DISKDLG_BOOTHD 24 -#define DISKDLG_EXIT 25 - +#define DISKDLG_ACSIPREVID 4 +#define DISKDLG_ACSIID 6 +#define DISKDLG_ACSINEXTID 7 +#define DISKDLG_ACSIEJECT 8 +#define DISKDLG_ACSIBROWSE 9 +#define DISKDLG_ACSINAME 10 +#define DISKDLG_SCSIPREVID 13 +#define DISKDLG_SCSIID 15 +#define DISKDLG_SCSINEXTID 16 +#define DISKDLG_SCSIEJECT 17 +#define DISKDLG_SCSIBROWSE 18 +#define DISKDLG_SCSINAME 19 +#define DISKDLG_IDEPREVID 22 +#define DISKDLG_IDEID 24 +#define DISKDLG_IDENEXTID 25 +#define DISKDLG_IDESWAPOFF 27 +#define DISKDLG_IDESWAPON 28 +#define DISKDLG_IDESWAPAUTO 29 +#define DISKDLG_IDEEJECT 30 +#define DISKDLG_IDEBROWSE 31 +#define DISKDLG_IDENAME 32 +#define DISKDLG_GEMDOSEJECT 35 +#define DISKDLG_GEMDOSBROWSE 36 +#define DISKDLG_GEMDOSNAME 37 +#define DISKDLG_GEMDOSCONV 38 +#define DISKDLG_DRIVESKIP 39 +#define DISKDLG_PROTOFF 41 +#define DISKDLG_PROTON 42 +#define DISKDLG_PROTAUTO 43 +#define DISKDLG_BOOTHD 44 +#define DISKDLG_EXIT 45 + +static char acsi_id_txt[2]; +static char scsi_id_txt[2]; +static char ide_id_txt[2]; +static char dlgname_gdos[64], dlgname_acsi[64]; +static char dlgname_scsi[64], dlgname_ide[64]; /* The disks dialog: */ static SGOBJ diskdlg[] = { - { SGBOX, 0, 0, 0,0, 64,22, NULL }, + { SGBOX, 0, 0, 0,0, 64,25, NULL }, { SGTEXT, 0, 0, 27,1, 10,1, "Hard disks" }, - { SGTEXT, 0, 0, 2,3, 14,1, "ACSI HD image:" }, - { SGBUTTON, 0, 0, 46,3, 7,1, "Ejec_t" }, - { SGBUTTON, 0, 0, 54,3, 8,1, "Brow_se" }, - { SGTEXT, 0, 0, 3,4, 58,1, NULL }, - - { SGTEXT, 0, 0, 2,5, 20,1, "IDE HD master image:" }, - { SGBUTTON, 0, 0, 46,5, 7,1, "Eje_ct" }, - { SGBUTTON, 0, 0, 54,5, 8,1, "Bro_wse" }, - { SGTEXT, 0, 0, 3,6, 58,1, NULL }, - - { SGTEXT, 0, 0, 2,7, 19,1, "IDE HD slave image:" }, - { SGBUTTON, 0, 0, 46,7, 7,1, "E_ject" }, - { SGBUTTON, 0, 0, 54,7, 8,1, "Br_owse" }, - { SGTEXT, 0, 0, 3,8, 58,1, NULL }, - - { SGTEXT, 0, 0, 2,9, 13,1, "GEMDOS drive:" }, - { SGBUTTON, 0, 0, 46,9, 7,1, "_Eject" }, - { SGBUTTON, 0, 0, 54,9, 8,1, "B_rowse" }, - { SGTEXT, 0, 0, 3,10, 58,1, NULL }, - - { SGCHECKBOX, 0, 0, 8,12, 42,1, "Atari <-> _host 8-bit file name conversion" }, - { SGCHECKBOX, 0, 0, 8,13, 42,1, "After ACSI/IDE _partitions (experimental)" }, - - { SGTEXT, 0, 0, 8,15, 31,1, "Write protection:" }, - { SGRADIOBUT, 0, 0, 26,15, 5,1, "O_ff" }, - { SGRADIOBUT, 0, 0, 32,15, 4,1, "O_n" }, - { SGRADIOBUT, 0, 0, 37,15, 6,1, "_Auto" }, + { SGBOX, 0, 0, 1,3, 62,2, NULL }, + { SGBOX, 0, 0, 1,3, 62,1, NULL }, + { SGBUTTON, 0, 0, 1,3, 3,1, "\x04" }, + { SGTEXT, 0, 0, 5,3, 7,1, "ACSI HD" }, + { SGTEXT, 0, 0, 13,3, 3,1, acsi_id_txt }, + { SGBUTTON, 0, 0, 15,3, 3,1, "\x03" }, + { SGBUTTON, 0, 0, 47,3, 7,1, "Ejec_t" }, + { SGBUTTON, 0, 0, 55,3, 8,1, "Brow_se" }, + { SGTEXT, 0, 0, 2,4, 60,1, dlgname_acsi }, + + { SGBOX, 0, 0, 1,6, 62,2, NULL }, + { SGBOX, 0, 0, 1,6, 62,1, NULL }, + { SGBUTTON, 0, 0, 1,6, 3,1, "\x04" }, + { SGTEXT, 0, 0, 5,6, 9,1, "SCSI HD" }, + { SGTEXT, 0, 0, 13,6, 1,1, scsi_id_txt }, + { SGBUTTON, 0, 0, 15,6, 3,1, "\x03" }, + { SGBUTTON, 0, 0, 47,6, 7,1, "Eje_ct" }, + { SGBUTTON, 0, 0, 55,6, 8,1, "Bro_wse" }, + { SGTEXT, 0, 0, 2,7, 60,1, dlgname_scsi }, + + { SGBOX, 0, 0, 1,9, 62,2, NULL }, + { SGBOX, 0, 0, 1,9, 62,1, NULL }, + { SGBUTTON, 0, 0, 1,9, 3,1, "\x04" }, + { SGTEXT, 0, 0, 5,9, 19,1, "IDE HD" }, + { SGTEXT, 0, 0, 12,9, 1,1, ide_id_txt }, + { SGBUTTON, 0, 0, 15,9, 3,1, "\x03" }, + { SGTEXT, 0, 0, 19,9, 9,1, "Byteswap:" }, + { SGRADIOBUT, 0, 0, 29,9, 5,1, "Off" }, + { SGRADIOBUT, 0, 0, 35,9, 4,1, "On" }, + { SGRADIOBUT, 0, 0, 40,9, 6,1, "Auto" }, + { SGBUTTON, 0, 0, 47,9, 7,1, "E_ject" }, + { SGBUTTON, 0, 0, 55,9, 8,1, "Br_owse" }, + { SGTEXT, 0, 0, 2,10, 60,1, dlgname_ide }, + + { SGBOX, 0, 0, 1,12, 62,8, NULL }, + { SGTEXT, 0, 0, 2,12, 13,1, "GEMDOS drive:" }, + { SGBUTTON, 0, 0, 47,12, 7,1, "_Eject" }, + { SGBUTTON, 0, 0, 55,12, 8,1, "B_rowse" }, + { SGTEXT, 0, 0, 3,13, 58,1, dlgname_gdos }, + + { SGCHECKBOX, 0, 0, 8,15, 43,1, "Atari <-> _host 8-bit file name conversion" }, + { SGCHECKBOX, 0, 0, 8,16, 46,1, "Add GEMDOS HD after ACSI/SCSI/IDE _partitions" }, + + { SGTEXT, 0, 0, 8,18, 31,1, "Write protection:" }, + { SGRADIOBUT, 0, 0, 26,18, 5,1, "O_ff" }, + { SGRADIOBUT, 0, 0, 32,18, 4,1, "O_n" }, + { SGRADIOBUT, 0, 0, 37,18, 6,1, "_Auto" }, - { SGCHECKBOX, 0, 0, 2,17, 16,1, "_Boot from HD" }, + { SGCHECKBOX, 0, 0, 2,21, 21,1, "_Boot from hard disk" }, - { SGBUTTON, SG_DEFAULT, 0, 22,20, 20,1, "Back to main menu" }, - { -1, 0, 0, 0,0, 0,0, NULL } + { SGBUTTON, SG_DEFAULT, 0, 22,23, 20,1, "Back to main menu" }, + { SGSTOP, 0, 0, 0,0, 0,0, NULL } }; @@ -100,6 +137,73 @@ static bool DlgDisk_BrowseDir(char *dlgn return false; } +static void DlgHardDisk_PrepAcsi(int id) +{ + if (ConfigureParams.Acsi[id].bUseDevice) + { + File_ShrinkName(dlgname_acsi, ConfigureParams.Acsi[id].sDeviceFile, + diskdlg[DISKDLG_ACSINAME].w); + } + else + { + dlgname_acsi[0] = '\0'; + } + + acsi_id_txt[0] = '0' + id; + acsi_id_txt[1] = 0; +} + +static void DlgHardDisk_PrepScsi(int id) +{ + if (ConfigureParams.Scsi[id].bUseDevice) + { + File_ShrinkName(dlgname_scsi, ConfigureParams.Scsi[id].sDeviceFile, + diskdlg[DISKDLG_SCSINAME].w); + } + else + { + dlgname_scsi[0] = '\0'; + } + + scsi_id_txt[0] = '0' + id; + scsi_id_txt[1] = 0; +} + +static void DlgHardDisk_PrepIde(int id) +{ + int idx; + + if (ConfigureParams.Ide[id].bUseDevice) + { + File_ShrinkName(dlgname_ide, ConfigureParams.Ide[id].sDeviceFile, + diskdlg[DISKDLG_IDENAME].w); + } + else + { + dlgname_ide[0] = '\0'; + } + + for (idx = DISKDLG_IDESWAPOFF; idx <= DISKDLG_IDESWAPAUTO; idx++) + diskdlg[idx].state &= ~SG_SELECTED; + diskdlg[DISKDLG_IDESWAPOFF + ConfigureParams.Ide[id].nByteSwap].state |= SG_SELECTED; + + ide_id_txt[0] = '0' + id; + ide_id_txt[1] = '\0'; +} + +static void DlgHardDisk_ReadBackIdeByteSwapSetting(int id) +{ + int idx; + + for (idx = DISKDLG_IDESWAPOFF; idx <= DISKDLG_IDESWAPAUTO; idx++) + { + if (diskdlg[idx].state & SG_SELECTED) + { + ConfigureParams.Ide[id].nByteSwap = idx - DISKDLG_IDESWAPOFF; + break; + } + } +} /** * Show and process the hard disk dialog. @@ -107,54 +211,22 @@ static bool DlgDisk_BrowseDir(char *dlgn void DlgHardDisk_Main(void) { int but, i; - char dlgname_gdos[64], dlgname_acsi[64]; - char dlgname_ide_master[64], dlgname_ide_slave[64]; + static int a_id, s_id, i_id; SDLGui_CenterDlg(diskdlg); /* Set up dialog to actual values: */ - /* Convert 8-bit GEMDOS file names? */ - if (ConfigureParams.HardDisk.bFilenameConversion) - diskdlg[DISKDLG_GEMDOSCONV].state |= SG_SELECTED; - else - diskdlg[DISKDLG_GEMDOSCONV].state &= ~SG_SELECTED; - - /* Skip ACSI/IDE partitions? */ - if (ConfigureParams.HardDisk.nGemdosDrive == DRIVE_SKIP) - diskdlg[DISKDLG_DRIVESKIP].state |= SG_SELECTED; - else - diskdlg[DISKDLG_DRIVESKIP].state &= ~SG_SELECTED; - /* Boot from harddisk? */ if (ConfigureParams.HardDisk.bBootFromHardDisk) diskdlg[DISKDLG_BOOTHD].state |= SG_SELECTED; else diskdlg[DISKDLG_BOOTHD].state &= ~SG_SELECTED; - /* ACSI hard disk image: */ - if (ConfigureParams.Acsi[0].bUseDevice) - File_ShrinkName(dlgname_acsi, ConfigureParams.Acsi[0].sDeviceFile, - diskdlg[DISKDLG_ACSINAME].w); - else - dlgname_acsi[0] = '\0'; - diskdlg[DISKDLG_ACSINAME].txt = dlgname_acsi; - - /* IDE master hard disk image: */ - if (ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage) - File_ShrinkName(dlgname_ide_master, ConfigureParams.HardDisk.szIdeMasterHardDiskImage, - diskdlg[DISKDLG_IDEMASTERNAME].w); - else - dlgname_ide_master[0] = '\0'; - diskdlg[DISKDLG_IDEMASTERNAME].txt = dlgname_ide_master; - - /* IDE slave hard disk image: */ - if (ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage) - File_ShrinkName(dlgname_ide_slave, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage, - diskdlg[DISKDLG_IDESLAVENAME].w); - else - dlgname_ide_slave[0] = '\0'; - diskdlg[DISKDLG_IDESLAVENAME].txt = dlgname_ide_slave; + /* Hard disk images: */ + DlgHardDisk_PrepAcsi(a_id); + DlgHardDisk_PrepScsi(s_id); + DlgHardDisk_PrepIde(i_id); /* GEMDOS hard disk directory: */ if (ConfigureParams.HardDisk.bUseHardDiskDirectories) @@ -163,6 +235,14 @@ void DlgHardDisk_Main(void) else dlgname_gdos[0] = '\0'; diskdlg[DISKDLG_GEMDOSNAME].txt = dlgname_gdos; + if (ConfigureParams.HardDisk.bFilenameConversion) + diskdlg[DISKDLG_GEMDOSCONV].state |= SG_SELECTED; + else + diskdlg[DISKDLG_GEMDOSCONV].state &= ~SG_SELECTED; + if (ConfigureParams.HardDisk.nGemdosDrive == DRIVE_SKIP) + diskdlg[DISKDLG_DRIVESKIP].state |= SG_SELECTED; + else + diskdlg[DISKDLG_DRIVESKIP].state &= ~SG_SELECTED; /* Write protection */ for (i = DISKDLG_PROTOFF; i <= DISKDLG_PROTAUTO; i++) @@ -177,36 +257,83 @@ void DlgHardDisk_Main(void) but = SDLGui_DoDialog(diskdlg, NULL, false); switch (but) { + case DISKDLG_ACSIPREVID: + if (a_id > 0) + { + --a_id; + DlgHardDisk_PrepAcsi(a_id); + } + break; + case DISKDLG_ACSINEXTID: + if (a_id < 7) + { + ++a_id; + DlgHardDisk_PrepAcsi(a_id); + } + break; case DISKDLG_ACSIEJECT: - ConfigureParams.Acsi[0].bUseDevice = false; + ConfigureParams.Acsi[a_id].bUseDevice = false; dlgname_acsi[0] = '\0'; break; case DISKDLG_ACSIBROWSE: if (SDLGui_FileConfSelect("ACSI HD image:", dlgname_acsi, - ConfigureParams.Acsi[0].sDeviceFile, + ConfigureParams.Acsi[a_id].sDeviceFile, diskdlg[DISKDLG_ACSINAME].w, false)) - ConfigureParams.Acsi[0].bUseDevice = true; + ConfigureParams.Acsi[a_id].bUseDevice = true; + break; + + case DISKDLG_SCSIPREVID: + if (s_id > 0) + { + --s_id; + DlgHardDisk_PrepScsi(s_id); + } + break; + case DISKDLG_SCSINEXTID: + if (s_id < 7) + { + ++s_id; + DlgHardDisk_PrepScsi(s_id); + } + break; + case DISKDLG_SCSIEJECT: + ConfigureParams.Scsi[s_id].bUseDevice = false; + dlgname_scsi[0] = '\0'; break; - case DISKDLG_IDEMASTEREJECT: - ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = false; - dlgname_ide_master[0] = '\0'; - break; - case DISKDLG_IDEMASTERBROWSE: - if (SDLGui_FileConfSelect("IDE HD master image:", dlgname_ide_master, - ConfigureParams.HardDisk.szIdeMasterHardDiskImage, - diskdlg[DISKDLG_IDEMASTERNAME].w, false)) - ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = true; - break; - case DISKDLG_IDESLAVEEJECT: - ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = false; - dlgname_ide_slave[0] = '\0'; - break; - case DISKDLG_IDESLAVEBROWSE: - if (SDLGui_FileConfSelect("IDE HD slave image:", dlgname_ide_slave, - ConfigureParams.HardDisk.szIdeSlaveHardDiskImage, - diskdlg[DISKDLG_IDESLAVENAME].w, false)) - ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = true; + case DISKDLG_SCSIBROWSE: + if (SDLGui_FileConfSelect("SCSI HD image:", dlgname_scsi, + ConfigureParams.Scsi[s_id].sDeviceFile, + diskdlg[DISKDLG_SCSINAME].w, false)) + ConfigureParams.Scsi[s_id].bUseDevice = true; + break; + + case DISKDLG_IDEPREVID: + DlgHardDisk_ReadBackIdeByteSwapSetting(i_id); + if (i_id > 0) + { + --i_id; + DlgHardDisk_PrepIde(i_id); + } break; + case DISKDLG_IDENEXTID: + DlgHardDisk_ReadBackIdeByteSwapSetting(i_id); + if (i_id < 1) + { + ++i_id; + DlgHardDisk_PrepIde(i_id); + } + break; + case DISKDLG_IDEEJECT: + ConfigureParams.Ide[i_id].bUseDevice = false; + dlgname_ide[0] = '\0'; + break; + case DISKDLG_IDEBROWSE: + if (SDLGui_FileConfSelect("IDE HD 0 image:", dlgname_ide, + ConfigureParams.Ide[i_id].sDeviceFile, + diskdlg[DISKDLG_IDENAME].w, false)) + ConfigureParams.Ide[i_id].bUseDevice = true; + break; + case DISKDLG_GEMDOSEJECT: ConfigureParams.HardDisk.bUseHardDiskDirectories = false; dlgname_gdos[0] = '\0'; @@ -223,6 +350,7 @@ void DlgHardDisk_Main(void) && but != SDLGUI_ERROR && !bQuitProgram); /* Read values from dialog: */ + DlgHardDisk_ReadBackIdeByteSwapSetting(i_id); for (i = DISKDLG_PROTOFF; i <= DISKDLG_PROTAUTO; i++) { if (diskdlg[i].state & SG_SELECTED)