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/m48t59.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/m48t59.c')
| -rw-r--r-- | hw/m48t59.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/m48t59.c b/hw/m48t59.c index 401b9693e1..0cc361eedc 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -50,8 +50,6 @@ */ struct M48t59State { - /* Model parameters */ - uint32_t type; // 2 = m48t02, 8 = m48t08, 59 = m48t59 /* Hardware parameters */ qemu_irq IRQ; uint32_t io_base; @@ -64,9 +62,12 @@ struct M48t59State { struct QEMUTimer *alrm_timer; struct QEMUTimer *wd_timer; /* NVRAM storage */ - uint8_t lock; - uint16_t addr; uint8_t *buffer; + /* Model parameters */ + uint32_t type; /* 2 = m48t02, 8 = m48t08, 59 = m48t59 */ + /* NVRAM storage */ + uint16_t addr; + uint8_t lock; }; typedef struct M48t59ISAState { |