VirtualBox

Changeset 7701 in vbox for trunk/src


Ignore:
Timestamp:
Apr 2, 2008 3:04:09 PM (17 years ago)
Author:
vboxsync
Message:

pcnet: a little bit less logging noise, code cosmetics

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Network/DevPCNet.cpp

    r7693 r7701  
    26942694            else
    26952695                pData->GCRDRA = (pData->GCRDRA & 0x0000ffff) | ((val & 0x0000ffff) << 16);
    2696             Log(("#%d: WRITE CSR%d, %#06x => GCRDRA=%08x (alt init)\n", PCNET_INST_NR,
    2697                  u32RAP, val, pData->GCRDRA));
     2696            Log(("#%d: WRITE CSR%d, %#06x => GCRDRA=%08x (alt init)\n", PCNET_INST_NR, u32RAP, val, pData->GCRDRA));
    26982697            break;
    26992698
    … …  
    27132712            else
    27142713                pData->GCTDRA = (pData->GCTDRA & 0x0000ffff) | ((val & 0x0000ffff) << 16);
    2715             Log(("#%d: WRITE CSR%d, %#06x => GCTDRA=%08x (alt init)\n", PCNET_INST_NR,
    2716                  u32RAP, val, pData->GCTDRA));
     2714            Log(("#%d: WRITE CSR%d, %#06x => GCTDRA=%08x (alt init)\n", PCNET_INST_NR, u32RAP, val, pData->GCTDRA));
    27172715            break;
    27182716
    … …  
    27942792    }
    27952793#ifdef PCNET_DEBUG_CSR
    2796     Log(("#%d pcnetCSRReadU16: rap=%d val=%#06x\n", PCNET_INST_NR,
    2797          u32RAP, val));
     2794    Log(("#%d pcnetCSRReadU16: rap=%d val=%#06x\n", PCNET_INST_NR, u32RAP, val));
    27982795#endif
    27992796    return val;
    … …  
    28052802    u32RAP &= 0x7f;
    28062803#ifdef PCNET_DEBUG_BCR
    2807     Log2(("#%d pcnetBCRWriteU16: rap=%d val=%#06x\n", PCNET_INST_NR,
    2808          u32RAP, val));
     2804    Log2(("#%d pcnetBCRWriteU16: rap=%d val=%#06x\n", PCNET_INST_NR, u32RAP, val));
    28092805#endif
    28102806    switch (u32RAP)
    … …  
    28632859            pData->aMII[pData->aBCR[BCR_MIIADDR] & 0x1f] = val;
    28642860#ifdef PCNET_DEBUG_MII
    2865             Log(("#%d pcnet: mii write %d <- %#x\n", PCNET_INST_NR,
    2866                    pData->aBCR[BCR_MIIADDR] & 0x1f, val));
     2861            Log(("#%d pcnet: mii write %d <- %#x\n", PCNET_INST_NR, pData->aBCR[BCR_MIIADDR] & 0x1f, val));
    28672862#endif
    28682863            break;
    … …  
    29832978
    29842979#ifdef PCNET_DEBUG_MII
    2985     Log(("#%d pcnet: mii read %d -> %#x\n", PCNET_INST_NR,
    2986          miiaddr, val));
     2980    Log(("#%d pcnet: mii read %d -> %#x\n", PCNET_INST_NR, miiaddr, val));
    29872981#endif
    29882982    return val;
    … …  
    30253019    }
    30263020#ifdef PCNET_DEBUG_BCR
    3027     Log2(("#%d pcnetBCRReadU16: rap=%d val=%#06x\n", PCNET_INST_NR,
    3028          u32RAP, val));
     3021    Log2(("#%d pcnetBCRReadU16: rap=%d val=%#06x\n", PCNET_INST_NR, u32RAP, val));
    30293022#endif
    30303023    return val;
    … …  
    30773070    addr &= 0x0f;
    30783071    val  &= 0xff;
    3079     Log(("#%d pcnetAPROMWriteU8: addr=%#010x val=%#04x\n", PCNET_INST_NR,
    3080          addr, val));
     3072    Log(("#%d pcnetAPROMWriteU8: addr=%#010x val=%#04x\n", PCNET_INST_NR, addr, val));
    30813073    /* Check APROMWE bit to enable write access */
    30823074    if (pcnetBCRReadU16(pData, 2) & 0x80)
    … …  
    30873079{
    30883080    uint32_t val = pData->aPROM[addr &= 0x0f];
    3089     Log(("#%d pcnetAPROMReadU8: addr=%#010x val=%#04x\n", PCNET_INST_NR,
    3090          addr, val));
     3081    Log(("#%d pcnetAPROMReadU8: addr=%#010x val=%#04x\n", PCNET_INST_NR, addr, val));
    30913082    return val;
    30923083}
    … …  
    32443235skip_update_irq:
    32453236#ifdef PCNET_DEBUG_IO
    3246     Log2(("#%d pcnetIoportReadU32: addr=%#010x val=%#010x\n", PCNET_INST_NR,
    3247          addr, val));
     3237    Log2(("#%d pcnetIoportReadU32: addr=%#010x val=%#010x\n", PCNET_INST_NR, addr, val));
    32483238#endif
    32493239    return val;
    … …  
    32533243{
    32543244#ifdef PCNET_DEBUG_IO
    3255     Log2(("#%d pcnetMMIOWriteU8: addr=%#010x val=%#04x\n", PCNET_INST_NR,
    3256          addr, val));
     3245    Log2(("#%d pcnetMMIOWriteU8: addr=%#010x val=%#04x\n", PCNET_INST_NR, addr, val));
    32573246#endif
    32583247    if (!(addr & 0x10))
    … …  
    32663255        val = pcnetAPROMReadU8(pData, addr);
    32673256#ifdef PCNET_DEBUG_IO
    3268     Log2(("#%d pcnetMMIOReadU8: addr=%#010x val=%#04x\n", PCNET_INST_NR,
    3269          addr, val & 0xff));
     3257    Log2(("#%d pcnetMMIOReadU8: addr=%#010x val=%#04x\n", PCNET_INST_NR, addr, val & 0xff));
    32703258#endif
    32713259    return val;
    … …  
    32753263{
    32763264#ifdef PCNET_DEBUG_IO
    3277     Log2(("#%d pcnetMMIOWriteU16: addr=%#010x val=%#06x\n", PCNET_INST_NR,
    3278          addr, val));
     3265    Log2(("#%d pcnetMMIOWriteU16: addr=%#010x val=%#06x\n", PCNET_INST_NR, addr, val));
    32793266#endif
    32803267    if (addr & 0x10)
    … …  
    33013288    }
    33023289#ifdef PCNET_DEBUG_IO
    3303     Log2(("#%d pcnetMMIOReadU16: addr=%#010x val = %#06x\n", PCNET_INST_NR,
    3304          addr, val & 0xffff));
     3290    Log2(("#%d pcnetMMIOReadU16: addr=%#010x val = %#06x\n", PCNET_INST_NR, addr, val & 0xffff));
    33053291#endif
    33063292    return val;
    … …  
    33103296{
    33113297#ifdef PCNET_DEBUG_IO
    3312     Log2(("#%d pcnetMMIOWriteU32: addr=%#010x val=%#010x\n", PCNET_INST_NR,
    3313          addr, val));
     3298    Log2(("#%d pcnetMMIOWriteU32: addr=%#010x val=%#010x\n", PCNET_INST_NR, addr, val));
    33143299#endif
    33153300    if (addr & 0x10)
    … …  
    33423327    }
    33433328#ifdef PCNET_DEBUG_IO
    3344     Log2(("#%d pcnetMMIOReadU32: addr=%#010x val=%#010x\n", PCNET_INST_NR,
    3345          addr, val));
     3329    Log2(("#%d pcnetMMIOReadU32: addr=%#010x val=%#010x\n", PCNET_INST_NR, addr, val));
    33463330#endif
    33473331    return val;
    … …  
    33903374    }
    33913375    STAM_PROFILE_ADV_STOP(&pData->StatAPROMRead, a);
    3392     LogFlow(("#%d pcnetIOPortAPromRead: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Vrc\n",
    3393              PCNET_INST_NR, Port, *pu32, cb, rc));
     3376    LogFlow(("#%d pcnetIOPortAPromRead: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Vrc\n", PCNET_INST_NR, Port, *pu32, cb, rc));
    33943377    return rc;
    33953378}
    … …  
    34293412        rc = VINF_SUCCESS;
    34303413    }
    3431     LogFlow(("#%d pcnetIOPortAPromWrite: Port=%RTiop u32=%#RX32 cb=%d rc=%Vrc\n",
    3432              PCNET_INST_NR, Port, u32, cb, rc));
     3414    LogFlow(("#%d pcnetIOPortAPromWrite: Port=%RTiop u32=%#RX32 cb=%d rc=%Vrc\n", PCNET_INST_NR, Port, u32, cb, rc));
    34333415#ifdef LOG_ENABLED
    34343416    if (rc == VINF_IOM_HC_IOPORT_WRITE)
    … …  
    34713453    }
    34723454    STAM_PROFILE_ADV_STOP(&pData->CTXSUFF(StatIORead), a);
    3473     LogFlow(("#%d pcnetIOPortRead: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Vrc\n",
    3474              PCNET_INST_NR, Port, *pu32, cb, rc));
     3455    Log2(("#%d pcnetIOPortRead: Port=%RTiop *pu32=%#RX32 cb=%d rc=%Vrc\n", PCNET_INST_NR, Port, *pu32, cb, rc));
    34753456#ifdef LOG_ENABLED
    34763457    if (rc == VINF_IOM_HC_IOPORT_READ)
    … …  
    35143495    }
    35153496    STAM_PROFILE_ADV_STOP(&pData->CTXSUFF(StatIOWrite), a);
    3516     LogFlow(("#%d pcnetIOPortWrite: Port=%RTiop u32=%#RX32 cb=%d rc=%Vrc\n",
    3517              PCNET_INST_NR, Port, u32, cb, rc));
     3497    Log2(("#%d pcnetIOPortWrite: Port=%RTiop u32=%#RX32 cb=%d rc=%Vrc\n", PCNET_INST_NR, Port, u32, cb, rc));
    35183498#ifdef LOG_ENABLED
    35193499    if (rc == VINF_IOM_HC_IOPORT_WRITE)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette