diff options
| author | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
| commit | 1afa194a0a3384c5a8fd150e4335d332c22883cf (patch) | |
| tree | 87d1ca2dbfb03128e628e344a713297131bad7f7 /hw/fdc.c | |
| parent | 157f2662fb4dd8f02885027e47f79fbee83c7b94 (diff) | |
| parent | f1a7104a5f435a1bf2a1158e6f737dbd89e8c153 (diff) | |
| download | focaccia-qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.gz focaccia-qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/fdc.c')
| -rw-r--r-- | hw/fdc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/hw/fdc.c b/hw/fdc.c index edf0360d1b..580b657791 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -374,13 +374,13 @@ enum { #define FD_FORMAT_CMD(state) ((state) & FD_STATE_FORMAT) struct FDCtrl { - /* Controller's identification */ - uint8_t version; - /* HW */ qemu_irq irq; - int dma_chann; /* Controller state */ QEMUTimer *result_timer; + int dma_chann; + /* Controller's identification */ + uint8_t version; + /* HW */ uint8_t sra; uint8_t srb; uint8_t dor; @@ -401,21 +401,21 @@ struct FDCtrl { uint8_t data_dir; uint8_t eot; /* last wanted sector */ /* States kept only to be returned back */ - /* Timers state */ - uint8_t timer0; - uint8_t timer1; /* precompensation */ uint8_t precomp_trk; uint8_t config; uint8_t lock; /* Power down config (also with status regB access mode */ uint8_t pwrd; - /* Sun4m quirks? */ - int sun4m; /* Floppy drives */ uint8_t num_floppies; + /* Sun4m quirks? */ + int sun4m; FDrive drives[MAX_FD]; int reset_sensei; + /* Timers state */ + uint8_t timer0; + uint8_t timer1; }; typedef struct FDCtrlSysBus { |