Fixes to the fixes of the devconf module which were, um, messed up.

This commit is contained in:
waltje
2018-04-02 02:00:01 -04:00
parent 428747a5a5
commit dfda1677d7
5 changed files with 24 additions and 25 deletions

View File

@@ -8,7 +8,7 @@
*
* Driver for the ESDI controller (WD1007-vse1) for PC/AT.
*
* Version: @(#)hdc_esdi_at.c 1.0.5 2018/03/31
* Version: @(#)hdc_esdi_at.c 1.0.6 2018/04/01
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -238,7 +238,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
{
esdi_t *esdi = (esdi_t *)priv;
#ifdef ENABLE_HDD_LOG
#if ENABLE_HDC_LOG > 1
pclog("WD1007 write(%04x, %02x)\n", port, val);
#endif
@@ -282,7 +282,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
esdi->command = val;
esdi->error = 0;
#ifdef ENABLE_HDD_LOG
#if ENABLE_HDC_LOG
pclog("WD1007: command %02x\n", val & 0xf0);
#endif
switch (val & 0xf0) {
@@ -478,7 +478,7 @@ esdi_read(uint16_t port, void *priv)
break;
}
#ifdef ENABLE_HDD_LOG
#if ENABLE_HDC_LOG > 1
pclog("WD1007 read(%04x) = %02x\n", port, temp);
#endif
@@ -508,7 +508,7 @@ esdi_callback(void *priv)
return;
}
#ifdef ENABLE_HDD_LOG
#if ENABLE_HDC_LOG
pclog("WD1007: command %02x\n", esdi->command);
#endif
@@ -656,7 +656,7 @@ esdi_callback(void *priv)
drive->cfg_spt = esdi->secount;
drive->cfg_hpc = esdi->head+1;
#ifdef ENABLE_HDD_LOG
#if ENABLE_HDC_LOG
pclog("WD1007: parameters: spt=%i hpc=%i\n", drive->cfg_spt,drive->cfg_hpc);
#endif
if (! esdi->secount)

View File

@@ -52,7 +52,7 @@
* however, are auto-configured by the system software as
* shown above.
*
* Version: @(#)hdc_esdi_mca.c 1.0.4 2018/03/31
* Version: @(#)hdc_esdi_mca.c 1.0.5 2018/04/01
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -757,7 +757,7 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
{
esdi_t *dev = (esdi_t *)priv;
#if 0
#if ENABLE_HDC_LOG > 1
pclog("ESDI: wr(%04x, %02x)\n", port-dev->base, val);
#endif
switch (port-dev->base) {
@@ -888,7 +888,7 @@ esdi_writew(uint16_t port, uint16_t val, void *priv)
{
esdi_t *dev = (esdi_t *)priv;
#if 0
#if ENABLE_HDC_LOG > 1
pclog("ESDI: wrw(%04x, %04x)\n", port-dev->base, val);
#endif
switch (port-dev->base) {
@@ -922,7 +922,7 @@ esdi_mca_read(int port, void *priv)
{
esdi_t *dev = (esdi_t *)priv;
#if 0
#if ENABLE_HDC_LOG > 1
pclog("ESDI: mcard(%04x)\n", port);
#endif
return(dev->pos_regs[port & 7]);
@@ -934,7 +934,7 @@ esdi_mca_write(int port, uint8_t val, void *priv)
{
esdi_t *dev = (esdi_t *)priv;
#if 0
#if ENABLE_HDC_LOG > 1
pclog("ESDI: mcawr(%04x, %02x) pos[2]=%02x pos[3]=%02x\n",
port, val, dev->pos_regs[2], dev->pos_regs[3]);
#endif

View File

@@ -12,7 +12,7 @@
* based design. Most cards were WD1003-WA2 or -WAH, where the
* -WA2 cards had a floppy controller as well (to save space.)
*
* Version: @(#)hdc_mfm_at.c 1.0.3 2018/03/27
* Version: @(#)hdc_mfm_at.c 1.0.4 2018/04/01
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>