summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-04-06 13:44:02 +0200
committerMichael S. Tsirkin <mst@redhat.com>2010-04-06 15:25:18 +0300
commit75f5a6cccdc76a025cb460d53bb7509a2b5d7548 (patch)
tree30a8a3772d4c867769c0297cb32abcdba8c13741
parente74818f3cd439e29aa18935631663e9abb84a302 (diff)
downloadhqemu-75f5a6cccdc76a025cb460d53bb7509a2b5d7548.zip
hqemu-75f5a6cccdc76a025cb460d53bb7509a2b5d7548.tar.gz
eepro100: Simplify status handling
Includes a minor STATUS_NOT_OK -> 0 tweak. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/eepro100.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 0415132..90e7d8a 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -882,7 +882,7 @@ static void action_command(EEPRO100State *s)
bool bit_s;
bool bit_i;
bool bit_nc;
- bool success = true;
+ uint16_t ok_status = STATUS_OK;
s->cb_address = s->cu_base + s->cu_offset;
read_cb(s);
bit_el = ((s->tx.command & COMMAND_EL) != 0);
@@ -915,7 +915,7 @@ static void action_command(EEPRO100State *s)
case CmdTx:
if (bit_nc) {
missing("CmdTx: NC = 0");
- success = false;
+ ok_status = 0;
break;
}
tx_command(s);
@@ -932,11 +932,11 @@ static void action_command(EEPRO100State *s)
break;
default:
missing("undefined command");
- success = false;
+ ok_status = 0;
break;
}
/* Write new status. */
- stw_phys(s->cb_address, s->tx.status | STATUS_C | (success ? STATUS_OK : 0));
+ stw_phys(s->cb_address, s->tx.status | ok_status | STATUS_C);
if (bit_i) {
/* CU completed action. */
eepro100_cx_interrupt(s);
OpenPOWER on IntegriCloud