OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: pcnet: fix source formatting and indentation 

Fix indentations and source format at few places. Add braces
around 'if' and 'while' statements.

Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Prasad J Pandit 2016-09-30 12:19:12 +05:30 committed by Jason Wang
parent 34e29ce754
commit 67aa449344
1 changed files with 67 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
hw/net/pcnet.c
View File

@ -302,7 +302,7 @@ static inline void pcnet_tmd_load(PCNetState *s, struct pcnet_TMD *tmd,
uint32_t tbadr; uint32_t tbadr;
int16_t length; int16_t length;
int16_t status; int16_t status;
} xda; } xda;
s->phys_mem_read(s->dma_opaque, addr, (void *)&xda, sizeof(xda), 0); s->phys_mem_read(s->dma_opaque, addr, (void *)&xda, sizeof(xda), 0);
tmd->tbadr = le32_to_cpu(xda.tbadr) & 0xffffff; tmd->tbadr = le32_to_cpu(xda.tbadr) & 0xffffff;
tmd->length = le16_to_cpu(xda.length); tmd->length = le16_to_cpu(xda.length);
@ -664,7 +664,9 @@ static inline int ladr_match(PCNetState *s, const uint8_t *buf, int size)
static inline hwaddr pcnet_rdra_addr(PCNetState *s, int idx) static inline hwaddr pcnet_rdra_addr(PCNetState *s, int idx)
{ {
while (idx < 1) idx += CSR_RCVRL(s); while (idx < 1) {
idx += CSR_RCVRL(s);
}
return s->rdra + ((CSR_RCVRL(s) - idx) * (BCR_SWSTYLE(s) ? 16 : 8)); return s->rdra + ((CSR_RCVRL(s) - idx) * (BCR_SWSTYLE(s) ? 16 : 8));
} }
@ -672,8 +674,10 @@ static inline int64_t pcnet_get_next_poll_time(PCNetState *s, int64_t current_ti
{ {
int64_t next_time = current_time + int64_t next_time = current_time +
(65536 - (CSR_SPND(s) ? 0 : CSR_POLL(s))) * 30; (65536 - (CSR_SPND(s) ? 0 : CSR_POLL(s))) * 30;
if (next_time <= current_time)
if (next_time <= current_time) {
next_time = current_time + 1; next_time = current_time + 1;
}
return next_time; return next_time;
} }
@ -795,13 +799,13 @@ static void pcnet_init(PCNetState *s)
mode = le16_to_cpu(initblk.mode); mode = le16_to_cpu(initblk.mode);
rlen = initblk.rlen >> 4; rlen = initblk.rlen >> 4;
tlen = initblk.tlen >> 4; tlen = initblk.tlen >> 4;
ladrf[0] = le16_to_cpu(initblk.ladrf[0]); ladrf[0] = le16_to_cpu(initblk.ladrf[0]);
ladrf[1] = le16_to_cpu(initblk.ladrf[1]); ladrf[1] = le16_to_cpu(initblk.ladrf[1]);
ladrf[2] = le16_to_cpu(initblk.ladrf[2]); ladrf[2] = le16_to_cpu(initblk.ladrf[2]);
ladrf[3] = le16_to_cpu(initblk.ladrf[3]); ladrf[3] = le16_to_cpu(initblk.ladrf[3]);
padr[0] = le16_to_cpu(initblk.padr[0]); padr[0] = le16_to_cpu(initblk.padr[0]);
padr[1] = le16_to_cpu(initblk.padr[1]); padr[1] = le16_to_cpu(initblk.padr[1]);
padr[2] = le16_to_cpu(initblk.padr[2]); padr[2] = le16_to_cpu(initblk.padr[2]);
rdra = le32_to_cpu(initblk.rdra); rdra = le32_to_cpu(initblk.rdra);
tdra = le32_to_cpu(initblk.tdra); tdra = le32_to_cpu(initblk.tdra);
} else { } else {
@ -809,13 +813,13 @@ static void pcnet_init(PCNetState *s)
s->phys_mem_read(s->dma_opaque, PHYSADDR(s,CSR_IADR(s)), s->phys_mem_read(s->dma_opaque, PHYSADDR(s,CSR_IADR(s)),
(uint8_t *)&initblk, sizeof(initblk), 0); (uint8_t *)&initblk, sizeof(initblk), 0);
mode = le16_to_cpu(initblk.mode); mode = le16_to_cpu(initblk.mode);
ladrf[0] = le16_to_cpu(initblk.ladrf[0]); ladrf[0] = le16_to_cpu(initblk.ladrf[0]);
ladrf[1] = le16_to_cpu(initblk.ladrf[1]); ladrf[1] = le16_to_cpu(initblk.ladrf[1]);
ladrf[2] = le16_to_cpu(initblk.ladrf[2]); ladrf[2] = le16_to_cpu(initblk.ladrf[2]);
ladrf[3] = le16_to_cpu(initblk.ladrf[3]); ladrf[3] = le16_to_cpu(initblk.ladrf[3]);
padr[0] = le16_to_cpu(initblk.padr[0]); padr[0] = le16_to_cpu(initblk.padr[0]);
padr[1] = le16_to_cpu(initblk.padr[1]); padr[1] = le16_to_cpu(initblk.padr[1]);
padr[2] = le16_to_cpu(initblk.padr[2]); padr[2] = le16_to_cpu(initblk.padr[2]);
rdra = le32_to_cpu(initblk.rdra); rdra = le32_to_cpu(initblk.rdra);
tdra = le32_to_cpu(initblk.tdra); tdra = le32_to_cpu(initblk.tdra);
rlen = rdra >> 29; rlen = rdra >> 29;
@ -858,12 +862,12 @@ static void pcnet_start(PCNetState *s)
printf("pcnet_start\n"); printf("pcnet_start\n");
#endif #endif
if (!CSR_DTX(s)) if (!CSR_DTX(s)) {
s->csr[0] |= 0x0010; /* set TXON */ s->csr[0] |= 0x0010; /* set TXON */
}
if (!CSR_DRX(s)) if (!CSR_DRX(s)) {
s->csr[0] |= 0x0020; /* set RXON */ s->csr[0] |= 0x0020; /* set RXON */
}
s->csr[0] &= ~0x0004; /* clear STOP bit */ s->csr[0] &= ~0x0004; /* clear STOP bit */
s->csr[0] |= 0x0002; s->csr[0] |= 0x0002;
pcnet_poll_timer(s); pcnet_poll_timer(s);
@ -925,8 +929,7 @@ static void pcnet_rdte_poll(PCNetState *s)
crda); crda);
} }
} else { } else {
printf("pcnet: BAD RMD RDA=0x" TARGET_FMT_plx "\n", printf("pcnet: BAD RMD RDA=0x" TARGET_FMT_plx "\n", crda);
crda);
#endif #endif
} }
} }
@ -1168,10 +1171,11 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
#endif #endif
while (pktcount--) { while (pktcount--) {
if (CSR_RCVRC(s) <= 1) if (CSR_RCVRC(s) <= 1) {
CSR_RCVRC(s) = CSR_RCVRL(s); CSR_RCVRC(s) = CSR_RCVRL(s);
else } else {
CSR_RCVRC(s)--; CSR_RCVRC(s)--;
}
} }
pcnet_rdte_poll(s); pcnet_rdte_poll(s);
@ -1207,7 +1211,7 @@ static void pcnet_transmit(PCNetState *s)
s->tx_busy = 1; s->tx_busy = 1;
txagain: txagain:
if (pcnet_tdte_poll(s)) { if (pcnet_tdte_poll(s)) {
struct pcnet_TMD tmd; struct pcnet_TMD tmd;
@ -1251,7 +1255,7 @@ static void pcnet_transmit(PCNetState *s)
s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr),
s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s));
s->xmit_pos += bcnt; s->xmit_pos += bcnt;
if (!GET_FIELD(tmd.status, TMDS, ENP)) { if (!GET_FIELD(tmd.status, TMDS, ENP)) {
goto txdone; goto txdone;
} }
@ -1276,21 +1280,22 @@ static void pcnet_transmit(PCNetState *s)
s->csr[4] |= 0x0004; /* set TXSTRT */ s->csr[4] |= 0x0004; /* set TXSTRT */
s->xmit_pos = -1; s->xmit_pos = -1;
txdone: txdone:
SET_FIELD(&tmd.status, TMDS, OWN, 0); SET_FIELD(&tmd.status, TMDS, OWN, 0);
TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s))); TMDSTORE(&tmd, PHYSADDR(s,CSR_CXDA(s)));
if (!CSR_TOKINTD(s) || (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) if (!CSR_TOKINTD(s)
|| (CSR_LTINTEN(s) && GET_FIELD(tmd.status, TMDS, LTINT))) {
s->csr[0] |= 0x0200; /* set TINT */ s->csr[0] |= 0x0200; /* set TINT */
}
if (CSR_XMTRC(s)<=1) if (CSR_XMTRC(s) <= 1) {
CSR_XMTRC(s) = CSR_XMTRL(s); CSR_XMTRC(s) = CSR_XMTRL(s);
else } else {
CSR_XMTRC(s)--; CSR_XMTRC(s)--;
if (count--) }
if (count--) {
goto txagain; goto txagain;
}
} else } else if (s->xmit_pos >= 0) {
if (s->xmit_pos >= 0) {
struct pcnet_TMD tmd; struct pcnet_TMD tmd;
TMDLOAD(&tmd, xmit_cxda); TMDLOAD(&tmd, xmit_cxda);
SET_FIELD(&tmd.misc, TMDM, BUFF, 1); SET_FIELD(&tmd.misc, TMDM, BUFF, 1);
@ -1301,9 +1306,9 @@ static void pcnet_transmit(PCNetState *s)
s->csr[0] |= 0x0200; /* set TINT */ s->csr[0] |= 0x0200; /* set TINT */
if (!CSR_DXSUFLO(s)) { if (!CSR_DXSUFLO(s)) {
s->csr[0] &= ~0x0010; s->csr[0] &= ~0x0010;
} else } else if (count--) {
if (count--) goto txagain;
goto txagain; }
} }
s->tx_busy = 0; s->tx_busy = 0;
@ -1315,13 +1320,11 @@ static void pcnet_poll(PCNetState *s)
pcnet_rdte_poll(s); pcnet_rdte_poll(s);
} }
if (CSR_TDMD(s) || if (CSR_TDMD(s) || (CSR_TXON(s) && !CSR_DPOLL(s) && pcnet_tdte_poll(s))) {
(CSR_TXON(s) && !CSR_DPOLL(s) && pcnet_tdte_poll(s)))
{
/* prevent recursion */ /* prevent recursion */
if (s->tx_busy) if (s->tx_busy) {
return; return;
}
pcnet_transmit(s); pcnet_transmit(s);
} }
} }
@ -1340,15 +1343,16 @@ static void pcnet_poll_timer(void *opaque)
if (!CSR_STOP(s) && !CSR_SPND(s) && !CSR_DPOLL(s)) { if (!CSR_STOP(s) && !CSR_SPND(s) && !CSR_DPOLL(s)) {
uint64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) * 33; uint64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) * 33;
if (!s->timer || !now) if (!s->timer || !now) {
s->timer = now; s->timer = now;
else { } else {
uint64_t t = now - s->timer + CSR_POLL(s); uint64_t t = now - s->timer + CSR_POLL(s);
if (t > 0xffffLL) { if (t > 0xffffLL) {
pcnet_poll(s); pcnet_poll(s);
CSR_POLL(s) = CSR_PINT(s); CSR_POLL(s) = CSR_PINT(s);
} else } else {
CSR_POLL(s) = t; CSR_POLL(s) = t;
}
} }
timer_mod(s->poll_timer, timer_mod(s->poll_timer,
pcnet_get_next_poll_time(s,qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL))); pcnet_get_next_poll_time(s,qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)));
@ -1371,21 +1375,21 @@ static void pcnet_csr_writew(PCNetState *s, uint32_t rap, uint32_t new_value)
val = (val & 0x007f) | (s->csr[0] & 0x7f00); val = (val & 0x007f) | (s->csr[0] & 0x7f00);
/* IFF STOP, STRT and INIT are set, clear STRT and INIT */ /* IFF STOP, STRT and INIT are set, clear STRT and INIT */
if ((val&7) == 7) if ((val & 7) == 7) {
val &= ~3; val &= ~3;
}
if (!CSR_STOP(s) && (val & 4)) if (!CSR_STOP(s) && (val & 4)) {
pcnet_stop(s); pcnet_stop(s);
}
if (!CSR_INIT(s) && (val & 1)) if (!CSR_INIT(s) && (val & 1)) {
pcnet_init(s); pcnet_init(s);
}
if (!CSR_STRT(s) && (val & 2)) if (!CSR_STRT(s) && (val & 2)) {
pcnet_start(s); pcnet_start(s);
}
if (CSR_TDMD(s)) if (CSR_TDMD(s)) {
pcnet_transmit(s); pcnet_transmit(s);
}
return; return;
case 1: case 1:
case 2: case 2:
@ -1435,9 +1439,10 @@ static void pcnet_csr_writew(PCNetState *s, uint32_t rap, uint32_t new_value)
val = (val > 0) ? val : 512; val = (val > 0) ? val : 512;
break; break;
case 112: case 112:
if (CSR_STOP(s) || CSR_SPND(s)) if (CSR_STOP(s) || CSR_SPND(s)) {
break; break;
return; }
return;
case 3: case 3:
break; break;
case 4: case 4:
@ -1654,8 +1659,7 @@ void pcnet_ioport_writel(void *opaque, uint32_t addr, uint32_t val)
pcnet_bcr_writew(s, s->rap, val & 0xffff); pcnet_bcr_writew(s, s->rap, val & 0xffff);
break; break;
} }
} else } else if ((addr & 0x0f) == 0) {
if ((addr & 0x0f) == 0) {
/* switch device to dword i/o mode */ /* switch device to dword i/o mode */
pcnet_bcr_writew(s, BCR_BSBC, pcnet_bcr_readw(s, BCR_BSBC) | 0x0080); pcnet_bcr_writew(s, BCR_BSBC, pcnet_bcr_readw(s, BCR_BSBC) | 0x0080);
#ifdef PCNET_DEBUG_IO #ifdef PCNET_DEBUG_IO