else if (pfl->width == 4)
boff = boff >> 2;
- DPRINTF("%s: reading offset %08x under cmd %02x\n",
- __func__, boff, pfl->cmd);
+ DPRINTF("%s: reading offset " TARGET_FMT_lx " under cmd %02x width %d\n",
+ __func__, offset, pfl->cmd, width);
switch (pfl->cmd) {
case 0x00:
switch (width) {
case 1:
ret = p[offset];
- DPRINTF("%s: data offset %08x %02x\n", __func__, offset, ret);
+ DPRINTF("%s: data offset " TARGET_FMT_lx " %02x\n",
+ __func__, offset, ret);
break;
case 2:
#if defined(TARGET_WORDS_BIGENDIAN)
ret = p[offset];
ret |= p[offset + 1] << 8;
#endif
- DPRINTF("%s: data offset %08x %04x\n", __func__, offset, ret);
+ DPRINTF("%s: data offset " TARGET_FMT_lx " %04x\n",
+ __func__, offset, ret);
break;
case 4:
#if defined(TARGET_WORDS_BIGENDIAN)
ret |= p[offset + 2] << 16;
ret |= p[offset + 3] << 24;
#endif
- DPRINTF("%s: data offset %08x %08x\n", __func__, offset, ret);
+ DPRINTF("%s: data offset " TARGET_FMT_lx " %08x\n",
+ __func__, offset, ret);
break;
default:
DPRINTF("BUG in %s\n", __func__);
uint8_t *p;
uint8_t cmd;
- /* WARNING: when the memory area is in ROMD mode, the offset is a
- ram offset, not a physical address */
cmd = value;
+ offset -= pfl->base;
- if (pfl->wcycle == 0)
- offset -= (target_ulong)(long)pfl->storage;
- else
- offset -= pfl->base;
-
- DPRINTF("%s: offset %08x %08x %d wcycle 0x%x\n",
- __func__, offset, value, width, pfl->wcycle);
+ DPRINTF("%s: writing offset " TARGET_FMT_lx " value %08x width %d wcycle 0x%x\n",
+ __func__, offset, value, width, pfl->wcycle);
/* Set the device in I/O access mode */
cpu_register_physical_memory(pfl->base, pfl->total_len, pfl->fl_mem);
p = pfl->storage;
offset &= ~(pfl->sector_len - 1);
- DPRINTF("%s: block erase at 0x%x bytes 0x%x\n", __func__,
- offset, pfl->sector_len);
+ DPRINTF("%s: block erase at " TARGET_FMT_lx " bytes "
+ TARGET_FMT_lx "\n",
+ __func__, offset, pfl->sector_len);
memset(p + offset, 0xff, pfl->sector_len);
pflash_update(pfl, offset, pfl->sector_len);
case 0x20: /* Block erase */
case 0x28:
if (cmd == 0xd0) { /* confirm */
- pfl->wcycle = 1;
+ pfl->wcycle = 0;
pfl->status |= 0x80;
- } if (cmd == 0xff) { /* read array mode */
+ } else if (cmd == 0xff) { /* read array mode */
goto reset_flash;
} else
goto error_flash;
break;
case 0xe8:
- DPRINTF("%s: block write of 0x%x bytes\n", __func__, cmd);
- pfl->counter = cmd;
+ DPRINTF("%s: block write of %x bytes\n", __func__, value);
+ pfl->counter = value;
pfl->wcycle++;
break;
case 0x60:
switch (pfl->cmd) {
case 0xe8: /* Block write */
p = pfl->storage;
- DPRINTF("%s: block write offset 0x%x value 0x%x counter 0x%x\n",
- __func__, offset, value, pfl->counter);
+ DPRINTF("%s: block write offset " TARGET_FMT_lx
+ " value %x counter " TARGET_FMT_lx "\n",
+ __func__, offset, value, pfl->counter);
switch (width) {
case 1:
p[offset] = value;
error_flash:
printf("%s: Unimplemented flash cmd sequence "
- "(offset 0x%x, wcycle 0x%x cmd 0x%x value 0x%x\n",
- __func__, offset, pfl->wcycle, pfl->cmd, value);
+ "(offset " TARGET_FMT_lx ", wcycle 0x%x cmd 0x%x value 0x%x)\n",
+ __func__, offset, pfl->wcycle, pfl->cmd, value);
reset_flash:
cpu_register_physical_memory(pfl->base, pfl->total_len,
return ret;
}
-pflash_t *pflash_register (target_phys_addr_t base, ram_addr_t off,
- BlockDriverState *bs,
- target_ulong sector_len, int nb_blocs, int width,
- uint16_t id0, uint16_t id1,
- uint16_t id2, uint16_t id3)
+pflash_t *pflash_cfi01_register(target_phys_addr_t base, ram_addr_t off,
+ BlockDriverState *bs, uint32_t sector_len,
+ int nb_blocs, int width,
+ uint16_t id0, uint16_t id1,
+ uint16_t id2, uint16_t id3)
{
pflash_t *pfl;
target_long total_len;
total_len = sector_len * nb_blocs;
/* XXX: to be fixed */
+#if 0
if (total_len != (8 * 1024 * 1024) && total_len != (16 * 1024 * 1024) &&
total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024))
return NULL;
+#endif
pfl = qemu_mallocz(sizeof(pflash_t));
pfl->cfi_table[0x28] = 0x02;
pfl->cfi_table[0x29] = 0x00;
/* Max number of bytes in multi-bytes write */
- pfl->cfi_table[0x2A] = 0x04;
+ pfl->cfi_table[0x2A] = 0x0B;
pfl->cfi_table[0x2B] = 0x00;
/* Number of erase block regions (uniform) */
pfl->cfi_table[0x2C] = 0x01;