[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/20] eepro100: Replace variable name to fix a comp
From: |
Stefan Weil |
Subject: |
[Qemu-devel] [PATCH 12/20] eepro100: Replace variable name to fix a compiler warning |
Date: |
Sun, 14 Feb 2010 17:16:21 +0100 |
When compiling with -Wshadow, gcc gives a warning
which is fixed by renaming stat -> status.
Signed-off-by: Stefan Weil <address@hidden>
---
hw/eepro100.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 01bcd6d..b5bd05b 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -392,14 +392,14 @@ static void eepro100_acknowledge(EEPRO100State * s)
}
}
-static void eepro100_interrupt(EEPRO100State * s, uint8_t stat)
+static void eepro100_interrupt(EEPRO100State * s, uint8_t status)
{
uint8_t mask = ~s->mem[SCBIntmask];
- s->mem[SCBAck] |= stat;
- stat = s->scb_stat = s->mem[SCBAck];
- stat &= (mask | 0x0f);
- //~ stat &= (~s->mem[SCBIntmask] | 0x0xf);
- if (stat && (mask & 0x01)) {
+ s->mem[SCBAck] |= status;
+ status = s->scb_stat = s->mem[SCBAck];
+ status &= (mask | 0x0f);
+ //~ status &= (~s->mem[SCBIntmask] | 0x0xf);
+ if (status && (mask & 0x01)) {
/* SCB mask and SCB Bit M do not disable interrupt. */
enable_interrupt(s);
} else if (s->int_stat) {
--
1.6.6.1
- [Qemu-devel] [PATCH 02/20] eepro100: Add missing SCB register names, (continued)
- [Qemu-devel] [PATCH 02/20] eepro100: Add missing SCB register names, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 03/20] eepro100: Fix PXE boot, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 04/20] eepro100: Support gpxe boot for all eepro100 devices, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 05/20] eepro100: Add all supported devices to pci.c, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 06/20] eepro100: Add TODO list, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 07/20] eepro100: Update copyright notice, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 08/20] eepro100: Add device descriptions, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 09/20] eepro100: Use symbolic names and BIT macros in binary operations, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 10/20] eepro100: Remove old unused code, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 11/20] eepro100: Use symbolic names for bits in EEPROM id, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 12/20] eepro100: Replace variable name to fix a compiler warning,
Stefan Weil <=
- [Qemu-devel] [PATCH 13/20] eepro100: Support RNR interrupt, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 14/20] eepro100: Fix CU Start command, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 15/20] eepro100: Prettify code (no functional changes), Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 16/20] eepro100: Use tx.status, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 17/20] eepro100: New function for reading command block, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 18/20] eepro100: Add diagnose command, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 19/20] eepro100: Remove C++ comments, Stefan Weil, 2010/02/14
- [Qemu-devel] [PATCH 20/20] eepro100: Keep includes sorted, Stefan Weil, 2010/02/14
- [Qemu-devel] Re: [PATCH 11/20] eepro100: Use symbolic names for bits in EEPROM id, Michael S. Tsirkin, 2010/02/21
- [Qemu-devel] Re: [PATCH 11/20] eepro100: Use symbolic names for bits in EEPROM id, Stefan Weil, 2010/02/21