ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fdc: remove last usage of FD_STATE_SEEK 

Replace it by directly setting FD_SR0_SEEK if required

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Hervé Poussineau 2012-09-20 23:11:58 +02:00 committed by Kevin Wolf
parent c83f97b563
commit cd30b53d22
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/fdc.c
View File

@ -355,7 +355,6 @@ enum {
enum { enum {
FD_STATE_MULTI = 0x01, /* multi track flag */ FD_STATE_MULTI = 0x01, /* multi track flag */
FD_STATE_FORMAT = 0x02, /* format flag */ FD_STATE_FORMAT = 0x02, /* format flag */
FD_STATE_SEEK = 0x04, /* seek flag */
}; };
enum { enum {
@ -497,7 +496,6 @@ enum {
}; };
#define FD_MULTI_TRACK(state) ((state) & FD_STATE_MULTI) #define FD_MULTI_TRACK(state) ((state) & FD_STATE_MULTI)
#define FD_DID_SEEK(state) ((state) & FD_STATE_SEEK)
#define FD_FORMAT_CMD(state) ((state) & FD_STATE_FORMAT) #define FD_FORMAT_CMD(state) ((state) & FD_STATE_FORMAT)
struct FDCtrl { struct FDCtrl {
@ -1422,8 +1420,6 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
fdctrl->data_dir == FD_DIR_SCANL || fdctrl->data_dir == FD_DIR_SCANL ||
fdctrl->data_dir == FD_DIR_SCANH) fdctrl->data_dir == FD_DIR_SCANH)
status2 = FD_SR2_SEH; status2 = FD_SR2_SEH;
if (FD_DID_SEEK(fdctrl->data_state))
status0 |= FD_SR0_SEEK;
fdctrl->data_len -= len; fdctrl->data_len -= len;
fdctrl_stop_transfer(fdctrl, status0, status1, status2); fdctrl_stop_transfer(fdctrl, status0, status1, status2);
transfer_error: transfer_error:
@ -1517,7 +1513,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl)
fdctrl->fifo[5] = ks; fdctrl->fifo[5] = ks;
return; return;
case 1: case 1:
fdctrl->data_state |= FD_STATE_SEEK; fdctrl->status0 |= FD_SR0_SEEK;
break; break;
default: default:
break; break;
@ -1531,10 +1527,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl)
if (cur_drv->sect == cur_drv->last_sect) { if (cur_drv->sect == cur_drv->last_sect) {
fdctrl->data_state &= ~FD_STATE_FORMAT; fdctrl->data_state &= ~FD_STATE_FORMAT;
/* Last sector done */ /* Last sector done */
if (FD_DID_SEEK(fdctrl->data_state)) fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
fdctrl_stop_transfer(fdctrl, FD_SR0_SEEK, 0x00, 0x00);
else
fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
} else { } else {
/* More to do */ /* More to do */
fdctrl->data_pos = 0; fdctrl->data_pos = 0;
@ -1661,7 +1654,6 @@ static void fdctrl_handle_format_track(FDCtrl *fdctrl, int direction)
fdctrl->data_state |= FD_STATE_MULTI; fdctrl->data_state |= FD_STATE_MULTI;
else else
fdctrl->data_state &= ~FD_STATE_MULTI; fdctrl->data_state &= ~FD_STATE_MULTI;
fdctrl->data_state &= ~FD_STATE_SEEK;
cur_drv->bps = cur_drv->bps =
fdctrl->fifo[2] > 7 ? 16384 : 128 << fdctrl->fifo[2]; fdctrl->fifo[2] > 7 ? 16384 : 128 << fdctrl->fifo[2];
#if 0 #if 0