From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLuho-0002Hc-0y for qemu-devel@nongnu.org; Fri, 07 Mar 2014 08:20:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLuhi-00061T-AY for qemu-devel@nongnu.org; Fri, 07 Mar 2014 08:20:51 -0500 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]:58590) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLuhh-00060x-Mw for qemu-devel@nongnu.org; Fri, 07 Mar 2014 08:20:46 -0500 From: Romain Dolbeau Date: Fri, 7 Mar 2014 14:20:14 +0100 Message-Id: <1394198414-22504-3-git-send-email-romain@dolbeau.org> In-Reply-To: <1394198414-22504-1-git-send-email-romain@dolbeau.org> References: <1394028846-9408-1-git-send-email-romain@dolbeau.org> <1394198414-22504-1-git-send-email-romain@dolbeau.org> Subject: [Qemu-devel] [PATCH 2/2 V4] spaces around '<<' everywhere List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Romain Dolbeau , Stefan Hajnoczi Signed-off-by: Romain Dolbeau --- hw/net/e1000.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 4d7204c..8987edd 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -49,7 +49,7 @@ enum { DEBUG_UNKNOWN, DEBUG_TXSUM, DEBUG_TXERR, DEBUG_RXERR, DEBUG_RXFILTER, DEBUG_PHY, DEBUG_NOTYET, }; -#define DBGBIT(x) (1<eecd_state.val_in |= 1; if (++s->eecd_state.bitnum_in == 9 && !s->eecd_state.reading) { - s->eecd_state.bitnum_out = ((s->eecd_state.val_in & 0x3f)<<4)-1; + s->eecd_state.bitnum_out = ((s->eecd_state.val_in & 0x3f) << 4)-1; s->eecd_state.reading = (((s->eecd_state.val_in >> 6) & 7) == EEPROM_READ_OPCODE_MICROWIRE); } @@ -1291,10 +1291,10 @@ e1000_mmio_write(void *opaque, hwaddr addr, uint64_t val, if (index < NWRITEOPS && macreg_writeops[index]) { macreg_writeops[index](s, index, val); } else if (index < NREADOPS && macreg_readops[index]) { - DBGOUT(MMIO, "e1000_mmio_writel RO %x: 0x%04"PRIx64"\n", index<<2, val); + DBGOUT(MMIO, "e1000_mmio_writel RO %x: 0x%04"PRIx64"\n", index << 2, val); } else { DBGOUT(UNKNOWN, "MMIO unknown write addr=0x%08x,val=0x%08"PRIx64"\n", - index<<2, val); + index << 2, val); } } @@ -1308,7 +1308,7 @@ e1000_mmio_read(void *opaque, hwaddr addr, unsigned size) { return macreg_readops[index](s, index); } - DBGOUT(UNKNOWN, "MMIO unknown read addr=0x%08x\n", index<<2); + DBGOUT(UNKNOWN, "MMIO unknown read addr=0x%08x\n", index << 2); return 0; } @@ -1358,7 +1358,7 @@ e1000_flash_write(void *opaque, hwaddr addr, uint64_t val, } } else { DBGOUT(UNKNOWN, "Flash unknown write addr=0x%08x,val=0x%08"PRIx64"\n", - index<<2, val); + index << 2, val); } } @@ -1371,7 +1371,7 @@ e1000_flash_read(void *opaque, hwaddr addr, unsigned size) if (index < FLASH_RSIZE) { return s->flash_reg[index]; } - DBGOUT(UNKNOWN, "Flash unknown read addr=0x%08x\n", index<<2); + DBGOUT(UNKNOWN, "Flash unknown read addr=0x%08x\n", index << 2); return 0; } @@ -1783,7 +1783,7 @@ static int pci_e1000_init(PCIDevice *pci_dev) qemu_macaddr_default_if_unset(&d->conf.macaddr); macaddr = d->conf.macaddr.a; for (i = 0; i < 3; i++) - d->eeprom_data[i] = (macaddr[2*i+1]<<8) | macaddr[2*i]; + d->eeprom_data[i] = (macaddr[2*i+1] << 8) | macaddr[2*i]; /* update eeprom with the proper device_id */ d->eeprom_data[11] = pdc->device_id; d->eeprom_data[13] = pdc->device_id; @@ -1803,7 +1803,7 @@ static int pci_e1000_init(PCIDevice *pci_dev) d->eeprom_data[i] = e1000_ich8_flash_template[i]; } for (i = 0; i < 3; i++) { - d->eeprom_data[i] = (macaddr[2*i+1]<<8) | macaddr[2*i]; + d->eeprom_data[i] = (macaddr[2*i+1] << 8) | macaddr[2*i]; } d->eeprom_data[11] = pdc->device_id; d->eeprom_data[13] = pdc->device_id; -- 1.7.10.4