[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/12] Added reset-pin emulation in model.
From: |
marcin . krzeminski |
Subject: |
[Qemu-devel] [PATCH 02/12] Added reset-pin emulation in model. |
Date: |
Wed, 16 Dec 2015 13:57:05 +0100 |
From: Marcin Krzeminski <address@hidden>
Signed-off-by: Marcin Krzeminski <address@hidden>
---
hw/block/m25p80.c | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index bfd493f..bcb66a5 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -258,6 +258,8 @@ typedef struct Flash {
uint8_t cmd_in_progress;
uint64_t cur_addr;
bool write_enable;
+ bool initialized;
+ uint8_t reset_pin;
int64_t dirty_page;
@@ -430,6 +432,19 @@ static void complete_collecting_data(Flash *s)
}
}
+static void reset_memory(Flash *s)
+{
+ s->cmd_in_progress = NOP;
+ s->cur_addr = 0;
+ s->len = 0;
+ s->needed_bytes = 0;
+ s->pos = 0;
+ s->state = STATE_IDLE;
+ s->write_enable = false;
+
+ DB_PRINT_L(0, "Reset done.\n");
+}
+
static void decode_new_cmd(Flash *s, uint32_t value)
{
s->cmd_in_progress = value;
@@ -620,6 +635,8 @@ static int m25p80_init(SSISlave *ss)
s->size = s->pi->sector_size * s->pi->n_sectors;
s->dirty_page = -1;
+ s->initialized = false;
+
/* FIXME use a qdev drive property instead of drive_get_next() */
dinfo = drive_get_next(IF_MTD);
@@ -650,9 +667,24 @@ static void m25p80_pre_save(void *opaque)
flash_sync_dirty((Flash *)opaque, -1);
}
+static void m25p80_reset(DeviceState *d)
+{
+ Flash *s = M25P80(d);
+
+ if (s->reset_pin || !s->initialized) {
+ reset_memory(s);
+ s->initialized = true;
+ }
+}
+
+static Property m25p80_properties[] = {
+ DEFINE_PROP_UINT8("reset-pin", Flash, reset_pin, 0),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
static const VMStateDescription vmstate_m25p80 = {
.name = "xilinx_spi",
- .version_id = 1,
+ .version_id = 2,
.minimum_version_id = 1,
.pre_save = m25p80_pre_save,
.fields = (VMStateField[]) {
@@ -664,6 +696,8 @@ static const VMStateDescription vmstate_m25p80 = {
VMSTATE_UINT8(cmd_in_progress, Flash),
VMSTATE_UINT64(cur_addr, Flash),
VMSTATE_BOOL(write_enable, Flash),
+ VMSTATE_BOOL(initialized, Flash),
+ VMSTATE_UINT8(reset_pin, Flash),
VMSTATE_END_OF_LIST()
}
};
@@ -679,6 +713,8 @@ static void m25p80_class_init(ObjectClass *klass, void
*data)
k->set_cs = m25p80_cs;
k->cs_polarity = SSI_CS_LOW;
dc->vmsd = &vmstate_m25p80;
+ dc->reset = &m25p80_reset;
+ dc->props = m25p80_properties;
mc->pi = data;
}
--
2.5.0
- [Qemu-devel] ODP: [PATCH 04/12] Changed variable type to allow serial eeprom emulation (changing 0->1)., (continued)
- [Qemu-devel] [PATCH 07/12] Added support for extend address mode commands., marcin . krzeminski, 2015/12/16
- [Qemu-devel] [PATCH 09/12] Support for 6Bytes jdec., marcin . krzeminski, 2015/12/16
- [Qemu-devel] [PATCH 08/12] Support for N25Q256A/N25Q512A, marcin . krzeminski, 2015/12/16
- [Qemu-devel] [PATCH 02/12] Added reset-pin emulation in model.,
marcin . krzeminski <=
- [Qemu-devel] [PATCH 06/12] 4byte address mode support added., marcin . krzeminski, 2015/12/16
- Re: [Qemu-devel] [PATCH 06/12] 4byte address mode support added., Cédric Le Goater, 2015/12/22
- [Qemu-devel] [PATCH 12/12] Read flag status register command support added., marcin . krzeminski, 2015/12/16