claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to xtide.c and statbar.c, fixes #80.

Browse Source
This commit is contained in:
waltje
2019-05-28 14:55:48 -05:00
parent 9505feae10
commit 5a921a1885
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/disk/hdc_xtide.c
View File

@@ -24,7 +24,7 @@
* FIXME: Make sure this works with the new IDE stuff, the AT and PS/2 * FIXME: Make sure this works with the new IDE stuff, the AT and PS/2
* controllers do not have dev->ide set to anything... * controllers do not have dev->ide set to anything...
* *
* Version: @(#)hdc_xtide.c 1.0.14 2019/05/17 * Version: @(#)hdc_xtide.c 1.0.15 2019/05/28
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -172,7 +172,7 @@ xtide_init(const device_t *info, UNUSED(void *parent))
dev = (hdc_t *)mem_alloc(sizeof(hdc_t)); dev = (hdc_t *)mem_alloc(sizeof(hdc_t));
memset(dev, 0x00, sizeof(hdc_t)); memset(dev, 0x00, sizeof(hdc_t));
switch(info->local) { switch(info->local & 0xff) {
case 0: case 0:
rom_sz = 0x4000; rom_sz = 0x4000;
io = 0x300; io = 0x300;

14
src/ui/ui_stbar.c
View File

@@ -8,7 +8,7 @@
* *
* Common UI support functions for the Status Bar module. * Common UI support functions for the Status Bar module.
* *
* Version: @(#)ui_stbar.c 1.0.20 2019/05/17 * Version: @(#)ui_stbar.c 1.0.21 2019/05/28
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -503,7 +503,7 @@ ui_sb_reset(void)
/* Check all (active) hard disks. */ /* Check all (active) hard disks. */
for (drive = 0; drive < HDD_NUM; drive++) { for (drive = 0; drive < HDD_NUM; drive++) {
if ((hdd[drive].bus == HDD_BUS_IDE) && if ((hdd[drive].bus == HDD_BUS_IDE) &&
!(hdint || !strncmp(hdc, "ide", 3) || !strncmp(hdc, "xta", 3))) { !(hdint || !strcmp(hdc, "ide") || !strcmp(hdc, "xtide") || !strcmp(hdc, "xta"))) {
/* Disk, but no controller for it. */ /* Disk, but no controller for it. */
continue; continue;
} }
@@ -520,7 +520,7 @@ ui_sb_reset(void)
for (drive = 0; drive < CDROM_NUM; drive++) { for (drive = 0; drive < CDROM_NUM; drive++) {
/* Could be Internal or External IDE.. */ /* Could be Internal or External IDE.. */
if ((cdrom[drive].bus_type == CDROM_BUS_ATAPI) && if ((cdrom[drive].bus_type == CDROM_BUS_ATAPI) &&
!(hdint || !strncmp(hdc, "ide", 3) || !strncmp(hdc, "xta", 3))) { !(hdint || !strcmp(hdc, "ide"))) {
continue; continue;
} }
@@ -535,7 +535,7 @@ ui_sb_reset(void)
for (drive = 0; drive < ZIP_NUM; drive++) { for (drive = 0; drive < ZIP_NUM; drive++) {
/* Could be Internal or External IDE.. */ /* Could be Internal or External IDE.. */
if ((zip_drives[drive].bus_type == ZIP_BUS_ATAPI) && if ((zip_drives[drive].bus_type == ZIP_BUS_ATAPI) &&
!(hdint || !strncmp(hdc, "ide", 3) || !strncmp(hdc, "xta", 3))) { !(hdint || !strcmp(hdc, "ide"))) {
continue; continue;
} }
@@ -584,7 +584,7 @@ ui_sb_reset(void)
for (drive = 0; drive < HDD_NUM; drive++) { for (drive = 0; drive < HDD_NUM; drive++) {
if ((hdd[drive].bus == HDD_BUS_IDE) && if ((hdd[drive].bus == HDD_BUS_IDE) &&
!(hdint || !strncmp(hdc, "ide", 3) || !strncmp(hdc, "xta", 3))) { !(hdint || !strcmp(hdc, "ide") || !strcmp(hdc, "xtide") || !strcmp(hdc, "xta"))) {
/* Disk, but no controller for it. */ /* Disk, but no controller for it. */
continue; continue;
} }
@@ -604,7 +604,7 @@ ui_sb_reset(void)
for (drive = 0; drive < CDROM_NUM; drive++) { for (drive = 0; drive < CDROM_NUM; drive++) {
/* Could be Internal or External IDE.. */ /* Could be Internal or External IDE.. */
if ((cdrom[drive].bus_type == CDROM_BUS_ATAPI) && if ((cdrom[drive].bus_type == CDROM_BUS_ATAPI) &&
!(hdint || !strncmp(hdc, "ide", 3))) { !(hdint || !strcmp(hdc, "ide"))) {
continue; continue;
} }
@@ -621,7 +621,7 @@ ui_sb_reset(void)
for (drive = 0; drive < ZIP_NUM; drive++) { for (drive = 0; drive < ZIP_NUM; drive++) {
/* Could be Internal or External IDE.. */ /* Could be Internal or External IDE.. */
if ((zip_drives[drive].bus_type == ZIP_BUS_ATAPI) && if ((zip_drives[drive].bus_type == ZIP_BUS_ATAPI) &&
!(hdint || !strncmp(hdc, "ide", 3))) { !(hdint || !strcmp(hdc, "ide"))) {
continue; continue;
} }