]> git.proxmox.com Git - qemu.git/commitdiff
eepro100: Use tx.status
authorStefan Weil <weil@mail.berlios.de>
Tue, 2 Mar 2010 21:37:56 +0000 (22:37 +0100)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 3 Mar 2010 11:34:19 +0000 (13:34 +0200)
There is no need for a local variable "status".
Using tx.status makes it clearer which status
is addressed.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/eepro100.c

index cf4e0ac2451bebc85440e684aa3a6a77e4336a2e..f5aa3068a4fd27f14debe0fed926ebca8ad1f014 100644 (file)
@@ -903,10 +903,10 @@ static void action_command(EEPRO100State *s)
     for (;;) {
         s->cb_address = s->cu_base + s->cu_offset;
         cpu_physical_memory_read(s->cb_address, (uint8_t *)&s->tx, sizeof(s->tx));
-        uint16_t status = le16_to_cpu(s->tx.status);
         uint16_t command = le16_to_cpu(s->tx.command);
+        s->tx.status = le16_to_cpu(s->tx.status);
         logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
-               status, command, s->tx.link);
+               s->tx.status, command, s->tx.link);
         bool bit_el = ((command & COMMAND_EL) != 0);
         bool bit_s = ((command & COMMAND_S) != 0);
         bool bit_i = ((command & COMMAND_I) != 0);
@@ -950,7 +950,7 @@ static void action_command(EEPRO100State *s)
             break;
         }
         /* Write new status. */
-        stw_phys(s->cb_address, status | STATUS_C | (success ? STATUS_OK : 0));
+        stw_phys(s->cb_address, s->tx.status | STATUS_C | (success ? STATUS_OK : 0));
         if (bit_i) {
             /* CU completed action. */
             eepro100_cx_interrupt(s);