diff mbox

[2/3] sonic: fix netcard reset

Message ID 1320616132-21864-2-git-send-email-hpoussin@reactos.org
State New
Headers show

Commit Message

Hervé Poussineau Nov. 6, 2011, 9:48 p.m. UTC 
From: Herv Poussineau <hpoussin@reactos.org>


Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/dp8393x.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Comments

Andreas Färber Nov. 7, 2011, 11:16 a.m. UTC | #1 
Am 06.11.2011 22:48, schrieb Hervé Poussineau:
> From: Herv Poussineau <hpoussin@reactos.org>

Typo.

At least to me it's not obvious why this is correct, so please add an
explanatory patch description.

Andreas

> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/dp8393x.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/dp8393x.c b/hw/dp8393x.c
> index cfec4cb..acb1604 100644
> --- a/hw/dp8393x.c
> +++ b/hw/dp8393x.c
> @@ -845,8 +845,7 @@ static void nic_reset(void *opaque)
>      s->regs[SONIC_CR] = SONIC_CR_RST | SONIC_CR_STP | SONIC_CR_RXDIS;
>      s->regs[SONIC_DCR] &= ~(SONIC_DCR_EXBUS | SONIC_DCR_LBR);
>      s->regs[SONIC_RCR] &= ~(SONIC_RCR_LB0 | SONIC_RCR_LB1 | SONIC_RCR_BRD | SONIC_RCR_RNT);
> -    s->regs[SONIC_TCR] |= SONIC_TCR_NCRS | SONIC_TCR_PTX;
> -    s->regs[SONIC_TCR] &= ~SONIC_TCR_BCM;
> +    s->regs[SONIC_TCR] = SONIC_TCR_NCRS | SONIC_TCR_PTX;
>      s->regs[SONIC_IMR] = 0;
>      s->regs[SONIC_ISR] = 0;
>      s->regs[SONIC_DCR2] = 0;
diff mbox

Patch

diff --git a/hw/dp8393x.c b/hw/dp8393x.c
index cfec4cb..acb1604 100644
--- a/hw/dp8393x.c
+++ b/hw/dp8393x.c
@@ -845,8 +845,7 @@  static void nic_reset(void *opaque)
     s->regs[SONIC_CR] = SONIC_CR_RST | SONIC_CR_STP | SONIC_CR_RXDIS;
     s->regs[SONIC_DCR] &= ~(SONIC_DCR_EXBUS | SONIC_DCR_LBR);
     s->regs[SONIC_RCR] &= ~(SONIC_RCR_LB0 | SONIC_RCR_LB1 | SONIC_RCR_BRD | SONIC_RCR_RNT);
-    s->regs[SONIC_TCR] |= SONIC_TCR_NCRS | SONIC_TCR_PTX;
-    s->regs[SONIC_TCR] &= ~SONIC_TCR_BCM;
+    s->regs[SONIC_TCR] = SONIC_TCR_NCRS | SONIC_TCR_PTX;
     s->regs[SONIC_IMR] = 0;
     s->regs[SONIC_ISR] = 0;
     s->regs[SONIC_DCR2] = 0;