From: Romain Dolbeau <romain@dolbeau.org>
To: qemu-devel@nongnu.org
Cc: Romain Dolbeau <romain@dolbeau.org>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH 2/2 V4] spaces around '<<' everywhere
Date: Fri, 7 Mar 2014 14:20:14 +0100 [thread overview]
Message-ID: <1394198414-22504-3-git-send-email-romain@dolbeau.org> (raw)
In-Reply-To: <1394198414-22504-1-git-send-email-romain@dolbeau.org>
Signed-off-by: Romain Dolbeau <romain@dolbeau.org>
---
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<<DEBUG_##x)
+#define DBGBIT(x) (1 << DEBUG_##x)
static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
#define DBGOUT(what, fmt, ...) do { \
@@ -557,7 +557,7 @@ set_eecd(E1000State *s, int index, uint32_t val)
if (val & E1000_EECD_DI)
s->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
next prev parent reply other threads:[~2014-03-07 13:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 9:08 [Qemu-devel] [PATCH v2 1/1] e1000: add the ability to select among several specific types of e1000[e]; 82566DM emulation ; some pointers to documentations and details Romain Dolbeau
2014-03-05 14:14 ` [Qemu-devel] [PATCH v3] " Romain Dolbeau
2014-03-05 16:55 ` Andreas Färber
2014-03-06 9:01 ` Romain Dolbeau
2014-03-07 13:20 ` [Qemu-devel] [PATCH 0/2 V4] E1000 device selection & 82566DM support Romain Dolbeau
2014-03-07 13:20 ` [Qemu-devel] [PATCH 1/2 V4] e1000: add the ability to select among several specific types of e1000[e]; 82566DM emulation ; some pointers to documentations and details Romain Dolbeau
2014-03-10 12:56 ` Stefan Hajnoczi
2014-03-07 13:20 ` Romain Dolbeau [this message]
2014-03-07 13:33 ` [Qemu-devel] [PATCH 2/2 V4] spaces around '<<' everywhere Eric Blake
2014-03-10 12:57 ` [Qemu-devel] [PATCH 0/2 V4] E1000 device selection & 82566DM support Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394198414-22504-3-git-send-email-romain@dolbeau.org \
--to=romain@dolbeau.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).