Catch wrong/unknown NOR flash command sequences, by Thorsten Zitterell.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3684
c046a42c-6fe2-441c-8c8c-
71466251a162
pfl->counter--;
break;
+ default:
+ goto error_flash;
}
return;
case 3: /* Confirm mode */
if (cmd == 0xd0) {
pfl->wcycle = 0;
pfl->status |= 0x80;
- break;
} else {
DPRINTF("%s: unknown command for \"write block\"\n", __func__);
PFLASH_BUG("Write block confirm");
+ goto reset_flash;
}
+ break;
+ default:
+ goto error_flash;
}
return;
default:
kqemu_allowed = 0;
#endif
linux_boot = (kernel_filename != NULL);
- net_boot = (boot_devices_bitmap >> ('n' - 'a')) && 0xF;
+ net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF;
/* XXX: this should not be: some embedded targets just have flash */
if (!linux_boot && net_boot == 0 &&