Commit 7317b8ca authored by balrog's avatar balrog

Fix a && -> & typo.

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
parent 9596ebb7
......@@ -353,6 +353,8 @@ static void pflash_write (pflash_t *pfl, target_ulong offset, uint32_t value,
pfl->counter--;
break;
default:
goto error_flash;
}
return;
case 3: /* Confirm mode */
......@@ -361,11 +363,14 @@ static void pflash_write (pflash_t *pfl, target_ulong offset, uint32_t value,
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:
......
......@@ -8269,7 +8269,7 @@ int main(int argc, char **argv)
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 &&
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment