spitz: make sl-nand emulation use qdev infrastructure

Switch sl-nand emulation to use qdev and vmstate. Also drop ecc_get/_put
functions as sl-nand was the only user of that code.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-01-21 13:12:11 +03:00 committed by Andrzej Zaborowski
parent 43842120f4
commit 34f9f0b580
4 changed files with 74 additions and 52 deletions

View File

@ -74,18 +74,15 @@ void ecc_reset(ECCState *s)
}
/* Save/restore */
void ecc_put(QEMUFile *f, ECCState *s)
{
qemu_put_8s(f, &s->cp);
qemu_put_be16s(f, &s->lp[0]);
qemu_put_be16s(f, &s->lp[1]);
qemu_put_be16s(f, &s->count);
}
void ecc_get(QEMUFile *f, ECCState *s)
{
qemu_get_8s(f, &s->cp);
qemu_get_be16s(f, &s->lp[0]);
qemu_get_be16s(f, &s->lp[1]);
qemu_get_be16s(f, &s->count);
}
VMStateDescription vmstate_ecc_state = {
.name = "ecc-state",
.version_id = 0,
.minimum_version_id = 0,
.minimum_version_id_old = 0,
.fields = (VMStateField []) {
VMSTATE_UINT8(cp, ECCState),
VMSTATE_UINT16_ARRAY(lp, ECCState, 2),
VMSTATE_UINT16(count, ECCState),
VMSTATE_END_OF_LIST(),
},
};

View File

@ -51,5 +51,4 @@ typedef struct {
uint8_t ecc_digest(ECCState *s, uint8_t sample);
void ecc_reset(ECCState *s);
void ecc_put(QEMUFile *f, ECCState *s);
void ecc_get(QEMUFile *f, ECCState *s);
extern VMStateDescription vmstate_ecc_state;

View File

@ -19,6 +19,7 @@
*/
#include "qemu-common.h"
#include "hw.h"
#include "flash.h"
#include "irq.h"
#include "blockdev.h"

View File

@ -47,8 +47,11 @@
#define FLASHCTL_NCE (FLASHCTL_CE0 | FLASHCTL_CE1)
typedef struct {
SysBusDevice busdev;
NANDFlashState *nand;
uint8_t ctl;
uint8_t manf_id;
uint8_t chip_id;
ECCState ecc;
} SLNANDState;
@ -131,56 +134,53 @@ static void sl_writeb(void *opaque, target_phys_addr_t addr,
}
}
static void sl_save(QEMUFile *f, void *opaque)
{
SLNANDState *s = (SLNANDState *) opaque;
qemu_put_8s(f, &s->ctl);
ecc_put(f, &s->ecc);
}
static int sl_load(QEMUFile *f, void *opaque, int version_id)
{
SLNANDState *s = (SLNANDState *) opaque;
qemu_get_8s(f, &s->ctl);
ecc_get(f, &s->ecc);
return 0;
}
enum {
FLASH_128M,
FLASH_1024M,
};
static void sl_flash_register(PXA2xxState *cpu, int size)
{
int iomemtype;
SLNANDState *s;
CPUReadMemoryFunc * const sl_readfn[] = {
static CPUReadMemoryFunc * const sl_readfn[] = {
sl_readb,
sl_readb,
sl_readl,
};
CPUWriteMemoryFunc * const sl_writefn[] = {
static CPUWriteMemoryFunc * const sl_writefn[] = {
sl_writeb,
sl_writeb,
sl_writeb,
};
s = (SLNANDState *) qemu_mallocz(sizeof(SLNANDState));
s->ctl = 0;
static void sl_flash_register(PXA2xxState *cpu, int size)
{
DeviceState *dev;
dev = qdev_create(NULL, "sl-nand");
qdev_prop_set_uint8(dev, "manf_id", NAND_MFR_SAMSUNG);
if (size == FLASH_128M)
s->nand = nand_init(NAND_MFR_SAMSUNG, 0x73);
qdev_prop_set_uint8(dev, "chip_id", 0x73);
else if (size == FLASH_1024M)
s->nand = nand_init(NAND_MFR_SAMSUNG, 0xf1);
qdev_prop_set_uint8(dev, "chip_id", 0xf1);
qdev_init_nofail(dev);
sysbus_mmio_map(sysbus_from_qdev(dev), 0, FLASH_BASE);
}
static int sl_nand_init(SysBusDevice *dev) {
int iomemtype;
SLNANDState *s;
s = FROM_SYSBUS(SLNANDState, dev);
s->ctl = 0;
s->nand = nand_init(s->manf_id, s->chip_id);
iomemtype = cpu_register_io_memory(sl_readfn,
sl_writefn, s, DEVICE_NATIVE_ENDIAN);
cpu_register_physical_memory(FLASH_BASE, 0x40, iomemtype);
register_savevm(NULL, "sl_flash", 0, 0, sl_save, sl_load, s);
sysbus_init_mmio(dev, 0x40, iomemtype);
return 0;
}
/* Spitz Keyboard */
@ -1027,6 +1027,30 @@ static void spitz_machine_init(void)
machine_init(spitz_machine_init);
static VMStateDescription vmstate_sl_nand_info = {
.name = "sl-nand",
.version_id = 0,
.minimum_version_id = 0,
.minimum_version_id_old = 0,
.fields = (VMStateField []) {
VMSTATE_UINT8(ctl, SLNANDState),
VMSTATE_STRUCT(ecc, SLNANDState, 0, vmstate_ecc_state, ECCState),
VMSTATE_END_OF_LIST(),
},
};
static SysBusDeviceInfo sl_nand_info = {
.init = sl_nand_init,
.qdev.name = "sl-nand",
.qdev.size = sizeof(SLNANDState),
.qdev.vmsd = &vmstate_sl_nand_info,
.qdev.props = (Property []) {
DEFINE_PROP_UINT8("manf_id", SLNANDState, manf_id, NAND_MFR_SAMSUNG),
DEFINE_PROP_UINT8("chip_id", SLNANDState, chip_id, 0xf1),
DEFINE_PROP_END_OF_LIST(),
},
};
static const VMStateDescription vmstate_corgi_ssp_regs = {
.name = "corgi-ssp",
.version_id = 1,
@ -1070,6 +1094,7 @@ static void spitz_register_devices(void)
{
ssi_register_slave(&corgi_ssp_info);
ssi_register_slave(&spitz_lcdtg_info);
sysbus_register_withprop(&sl_nand_info);
}
device_init(spitz_register_devices)