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

nand: Don't inherit from Sysbus 

Nand chips are not sysbus devices - they do not have any sense of MMIO,
nor interrupts. Re-parent to TYPE_DEVICE accordingly.

Cc: afaerber@suse.de

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Crosthwaite 2013-06-18 21:12:41 +10:00 committed by Peter Maydell
parent d47a5d9b9d
commit 7426aa72c3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/block/nand.c
View File

@ -21,7 +21,7 @@
# include "hw/hw.h" # include "hw/hw.h"
# include "hw/block/flash.h" # include "hw/block/flash.h"
# include "sysemu/blockdev.h" # include "sysemu/blockdev.h"
# include "hw/sysbus.h" #include "hw/qdev.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
# define NAND_CMD_READ0 0x00 # define NAND_CMD_READ0 0x00
@ -54,7 +54,8 @@
typedef struct NANDFlashState NANDFlashState; typedef struct NANDFlashState NANDFlashState;
struct NANDFlashState { struct NANDFlashState {
SysBusDevice busdev; DeviceState parent_obj;
uint8_t manf_id, chip_id; uint8_t manf_id, chip_id;
uint8_t buswidth; /* in BYTES */ uint8_t buswidth; /* in BYTES */
int size, pages; int size, pages;
@ -440,7 +441,7 @@ static void nand_class_init(ObjectClass *klass, void *data)
static const TypeInfo nand_info = { static const TypeInfo nand_info = {
.name = TYPE_NAND, .name = TYPE_NAND,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_DEVICE,
.instance_size = sizeof(NANDFlashState), .instance_size = sizeof(NANDFlashState),
.class_init = nand_class_init, .class_init = nand_class_init,
}; };