const char *cpu_model)
{
struct beagle_s *s = (struct beagle_s *) qemu_mallocz(sizeof(*s));
- int sdindex = drive_get_index(IF_SD, 0, 0);
void *opaque;
- if (sdindex == -1) {
- fprintf(stderr, "%s: missing SecureDigital device\n", __FUNCTION__);
- exit(1);
+ if (drive_get_index(IF_SD, 0, 0) < 0 ||
+ drive_get_index(IF_MTD, 0, 0) < 0) {
+ hw_error("%s: missing SD or NAND device\n", __FUNCTION__);
}
s->cpu = omap3530_mpu_init(ram_size, NULL, NULL, serial_hds[0]);
- s->nand = nand_init(NAND_MFR_MICRON, 0xba); /* MT29F2G16ABC */
+ s->nand = nand_init(NAND_MFR_MICRON, 0xba,
+ drives_table[drive_get_index(IF_MTD, 0, 0)].bdrv);
nand_setpins(s->nand, 0, 0, 0, 1, 0); /* no write-protect */
omap_gpmc_attach(s->cpu->gpmc, BEAGLE_NAND_CS, 0, NULL, NULL, s->nand, 2);
- omap3_mmc_attach(s->cpu->omap3_mmc[0], drives_table[sdindex].bdrv);
+ omap3_mmc_attach(s->cpu->omap3_mmc[0],
+ drives_table[drive_get_index(IF_SD, 0, 0)].bdrv);
s->i2c = omap_i2c_bus(s->cpu->i2c[0]);
s->twl4030 = twl4030_init(s->i2c, s->cpu->irq[0][OMAP_INT_3XXX_SYS_NIRQ]);
/* nand.c */
typedef struct NANDFlashState NANDFlashState;
-NANDFlashState *nand_init(int manf_id, int chip_id);
+NANDFlashState *nand_init(int manf_id, int chip_id, BlockDriverState *bdrv);
void nand_done(NANDFlashState *s);
void nand_setpins(NANDFlashState *s,
int cle, int ale, int ce, int wp, int gnd);
# include "hw.h"
# include "flash.h"
# include "block.h"
-/* FIXME: Pass block device as an argument. */
-# include "sysemu.h"
# define NAND_CMD_READ0 0x00
# define NAND_CMD_READ1 0x01
return (s->buswidth << 3);
}
-NANDFlashState *nand_init(int manf_id, int chip_id)
+NANDFlashState *nand_init(int manf_id, int chip_id, BlockDriverState *bdrv)
{
int pagesize;
NANDFlashState *s;
- int index;
if (nand_flash_ids[chip_id].size == 0) {
hw_error("%s: Unsupported NAND chip ID.\n", __FUNCTION__);
}
s = (NANDFlashState *) qemu_mallocz(sizeof(NANDFlashState));
- index = drive_get_index(IF_MTD, 0, 0);
- if (index != -1)
- s->bdrv = drives_table[index].bdrv;
+ s->bdrv = bdrv;
s->manf_id = manf_id;
s->chip_id = chip_id;
s->buswidth = (uint8_t)(nand_flash_ids[s->chip_id].width >> 3);
return;
if (!s->bdrv) {
- memcpy(s->storage + PAGE_START(s->addr) + (s->addr & PAGE_MASK) +
- s->offset, s->io, s->iolen);
+ uint8_t *p = s->storage + PAGE_START(s->addr) + (s->addr & PAGE_MASK) +
+ s->offset;
+ int i;
+ for (i = 0; i < s->iolen; i++) {
+ p[i] &= s->io[i];
+ }
} else if (s->mem_oob) {
sector = SECTOR(s->addr);
off = (s->addr & PAGE_MASK) + s->offset;
return;
}
- memcpy(iobuf + (soff | off), s->io, MIN(s->iolen, PAGE_SIZE - off));
+ uint8_t *p = iobuf + (soff | off);
+ int i, count = MIN(s->iolen, PAGE_SIZE - off);
+ for (i = 0; i < count; i++) {
+ p[i] &= s->io[i];
+ }
if (off + s->iolen > PAGE_SIZE) {
page = PAGE(s->addr);
- memcpy(s->storage + (page << OOB_SHIFT), s->io + PAGE_SIZE - off,
- MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE));
+ p = s->storage + (page << OOB_SHIFT);
+ uint8_t *q = s->io + PAGE_SIZE - off;
+ count = MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE);
+ for (i = 0; i < count; i++) {
+ p[i] &= q[i];
+ }
}
if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS) == -1)
return;
}
- memcpy(iobuf + soff, s->io, s->iolen);
+ uint8_t *p = iobuf + soff;
+ int i;
+ for (i = 0; i < s->iolen; i++) {
+ p[i] &= s->io[i];
+ }
if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) == -1)
printf("%s: write error in sector %lli\n", __FUNCTION__, sector);
s = (SLNANDState *) qemu_mallocz(sizeof(SLNANDState));
s->ctl = 0;
+ BlockDriverState *bdrv = NULL;
+ if (drive_get_index(IF_MTD, 0, 0) >= 0) {
+ bdrv = drives_table[drive_get_index(IF_MTD, 0, 0)].bdrv;
+ }
if (size == FLASH_128M)
- s->nand = nand_init(NAND_MFR_SAMSUNG, 0x73);
+ s->nand = nand_init(NAND_MFR_SAMSUNG, 0x73, bdrv);
else if (size == FLASH_1024M)
- s->nand = nand_init(NAND_MFR_SAMSUNG, 0xf1);
+ s->nand = nand_init(NAND_MFR_SAMSUNG, 0xf1, bdrv);
iomemtype = cpu_register_io_memory(0, sl_readfn,
sl_writefn, s);
#include "flash.h"
#include "console.h"
#include "pixel_ops.h"
+#include "sysemu.h"
#define IRQ_TC6393_NAND 0
#define IRQ_TC6393_MMC 1
s->sub_irqs = qemu_allocate_irqs(tc6393xb_sub_irq, s, TC6393XB_NR_IRQS);
- s->flash = nand_init(NAND_MFR_TOSHIBA, 0x76);
+ BlockDriverState *bdrv = NULL;
+ if (drive_get_index(IF_MTD, 0, 0) >= 0) {
+ bdrv = drives_table[drive_get_index(IF_MTD, 0, 0)].bdrv;
+ }
+ s->flash = nand_init(NAND_MFR_TOSHIBA, 0x76, bdrv);
iomemtype = cpu_register_io_memory(0, tc6393xb_readfn,
tc6393xb_writefn, s);