View | Details | Raw Unified | Return to bug 12803 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/pccard/if_xe.c (-17 / +19 lines)
Lines 99-104 Link Here
99
 */
99
 */
100
100
101
101
102
#include "opt_xe.h"
103
102
#ifndef XE_DEBUG
104
#ifndef XE_DEBUG
103
#define XE_DEBUG 1	/* Increase for more voluminous output! */
105
#define XE_DEBUG 1	/* Increase for more voluminous output! */
104
#endif
106
#endif
Lines 268-274 Link Here
268
/*
270
/*
269
 * Debug functions
271
 * Debug functions
270
 */
272
 */
271
#ifdef XE_DEBUG
273
#if XE_DEBUG > 0
272
#define XE_REG_DUMP(scp)		xe_reg_dump((scp))
274
#define XE_REG_DUMP(scp)		xe_reg_dump((scp))
273
#define XE_MII_DUMP(scp)		xe_mii_dump((scp))
275
#define XE_MII_DUMP(scp)		xe_mii_dump((scp))
274
static void      xe_reg_dump		(struct xe_softc *scp);
276
static void      xe_reg_dump		(struct xe_softc *scp);
Lines 325-331 Link Here
325
 */
327
 */
326
static int
328
static int
327
xe_probe (struct isa_device *dev) {
329
xe_probe (struct isa_device *dev) {
328
#ifdef XE_DEBUG
330
#if XE_DEBUG > 0
329
  printf("xe%d: probe\n", dev->id_unit);
331
  printf("xe%d: probe\n", dev->id_unit);
330
#endif
332
#endif
331
  bzero(sca, MAXSLOT * sizeof(sca[0]));
333
  bzero(sca, MAXSLOT * sizeof(sca[0]));
Lines 480-486 Link Here
480
  dev = &devi->isahd;
482
  dev = &devi->isahd;
481
  success = 0;
483
  success = 0;
482
484
483
#ifdef XE_DEBUG
485
#if XE_DEBUG > 0
484
  printf("xe: Probing for unit %d\n", unit);
486
  printf("xe: Probing for unit %d\n", unit);
485
#endif
487
#endif
486
488
Lines 722-728 Link Here
722
  struct xe_softc *scp = sca[dev->id_unit];
724
  struct xe_softc *scp = sca[dev->id_unit];
723
  int i;
725
  int i;
724
726
725
#ifdef XE_DEBUG
727
#if XE_DEBUG > 0
726
  printf("xe%d: attach\n", scp->unit);
728
  printf("xe%d: attach\n", scp->unit);
727
#endif
729
#endif
728
730
Lines 823-829 Link Here
823
  struct xe_softc *scp = xscp;
825
  struct xe_softc *scp = xscp;
824
  int s;
826
  int s;
825
827
826
#ifdef XE_DEBUG
828
#if XE_DEBUG > 0
827
  printf("xe%d: init\n", scp->unit);
829
  printf("xe%d: init\n", scp->unit);
828
#endif
830
#endif
829
831
Lines 1351-1357 Link Here
1351
xe_media_change(struct ifnet *ifp) {
1353
xe_media_change(struct ifnet *ifp) {
1352
  struct xe_softc *scp = ifp->if_softc;
1354
  struct xe_softc *scp = ifp->if_softc;
1353
1355
1354
#ifdef XE_DEBUG
1356
#if XE_DEBUG > 0
1355
  printf("xe%d: media_change\n", ifp->if_unit);
1357
  printf("xe%d: media_change\n", ifp->if_unit);
1356
#endif
1358
#endif
1357
1359
Lines 1377-1383 Link Here
1377
static void
1379
static void
1378
xe_media_status(struct ifnet *ifp, struct ifmediareq *mrp) {
1380
xe_media_status(struct ifnet *ifp, struct ifmediareq *mrp) {
1379
1381
1380
#ifdef XE_DEBUG
1382
#if XE_DEBUG > 0
1381
  printf("xe%d: media_status\n", ifp->if_unit);
1383
  printf("xe%d: media_status\n", ifp->if_unit);
1382
#endif
1384
#endif
1383
1385
Lines 1394-1400 Link Here
1394
  struct xe_softc *scp = xscp;
1396
  struct xe_softc *scp = xscp;
1395
  u_int16_t bmcr, bmsr, anar, lpar;
1397
  u_int16_t bmcr, bmsr, anar, lpar;
1396
1398
1397
#ifdef XE_DEBUG
1399
#if XE_DEBUG > 0
1398
  printf("xe%d: setmedia\n", scp->unit);
1400
  printf("xe%d: setmedia\n", scp->unit);
1399
#endif
1401
#endif
1400
1402
Lines 1671-1677 Link Here
1671
xe_hard_reset(struct xe_softc *scp) {
1673
xe_hard_reset(struct xe_softc *scp) {
1672
  int s;
1674
  int s;
1673
1675
1674
#ifdef XE_DEBUG
1676
#if XE_DEBUG > 0
1675
  printf("xe%d: hard_reset\n", scp->unit);
1677
  printf("xe%d: hard_reset\n", scp->unit);
1676
#endif
1678
#endif
1677
1679
Lines 1708-1714 Link Here
1708
xe_soft_reset(struct xe_softc *scp) {
1710
xe_soft_reset(struct xe_softc *scp) {
1709
  int s;
1711
  int s;
1710
1712
1711
#ifdef XE_DEBUG
1713
#if XE_DEBUG > 0
1712
  printf("xe%d: soft_reset\n", scp->unit);
1714
  printf("xe%d: soft_reset\n", scp->unit);
1713
#endif
1715
#endif
1714
1716
Lines 1748-1754 Link Here
1748
    scp->srev = (XE_INB(XE_BOV) & 0x70) >> 4;
1750
    scp->srev = (XE_INB(XE_BOV) & 0x70) >> 4;
1749
  else
1751
  else
1750
    scp->srev = (XE_INB(XE_BOV) & 0x30) >> 4;
1752
    scp->srev = (XE_INB(XE_BOV) & 0x30) >> 4;
1751
#ifdef XE_DEBUG
1753
#if XE_DEBUG > 0
1752
  printf("xe%d: silicon revision = %d\n", scp->unit, scp->srev);
1754
  printf("xe%d: silicon revision = %d\n", scp->unit, scp->srev);
1753
#endif
1755
#endif
1754
  
1756
  
Lines 1779-1785 Link Here
1779
xe_stop(struct xe_softc *scp) {
1781
xe_stop(struct xe_softc *scp) {
1780
  int s;
1782
  int s;
1781
1783
1782
#ifdef XE_DEBUG
1784
#if XE_DEBUG > 0
1783
  printf("xe%d: stop\n", scp->unit);
1785
  printf("xe%d: stop\n", scp->unit);
1784
#endif
1786
#endif
1785
1787
Lines 1815-1821 Link Here
1815
 */
1817
 */
1816
static void
1818
static void
1817
xe_enable_intr(struct xe_softc *scp) {
1819
xe_enable_intr(struct xe_softc *scp) {
1818
#ifdef XE_DEBUG
1820
#if XE_DEBUG > 0
1819
  printf("xe%d: enable_intr\n", scp->unit);
1821
  printf("xe%d: enable_intr\n", scp->unit);
1820
#endif
1822
#endif
1821
1823
Lines 1839-1845 Link Here
1839
 */
1841
 */
1840
static void
1842
static void
1841
xe_disable_intr(struct xe_softc *scp) {
1843
xe_disable_intr(struct xe_softc *scp) {
1842
#ifdef XE_DEBUG
1844
#if XE_DEBUG > 0
1843
  printf("xe%d: disable_intr\n", scp->unit);
1845
  printf("xe%d: disable_intr\n", scp->unit);
1844
#endif
1846
#endif
1845
1847
Lines 2392-2398 Link Here
2392
}
2394
}
2393
2395
2394
2396
2395
#ifdef XE_DEBUG
2397
#if XE_DEBUG > 0
2396
/*
2398
/*
2397
 * A bit of debugging code.
2399
 * A bit of debugging code.
2398
 */
2400
 */
Lines 2468-2474 Link Here
2468
static int
2470
static int
2469
xe_suspend(void *xunit) {
2471
xe_suspend(void *xunit) {
2470
2472
2471
#ifdef XE_DEBUG
2473
#if XE_DEBUG > 0
2472
  struct xe_softc *scp = sca[(int)xunit];
2474
  struct xe_softc *scp = sca[(int)xunit];
2473
2475
2474
  printf("xe%d: APM suspend\n", scp->unit);
2476
  printf("xe%d: APM suspend\n", scp->unit);
Lines 2483-2489 Link Here
2483
static int
2485
static int
2484
xe_resume(void *xunit) {
2486
xe_resume(void *xunit) {
2485
2487
2486
#ifdef XE_DEBUG
2488
#if XE_DEBUG > 0
2487
  struct xe_softc *scp = sca[(int)xunit];
2489
  struct xe_softc *scp = sca[(int)xunit];
2488
2490
2489
  printf("xe%d: APM resume\n", scp->unit);
2491
  printf("xe%d: APM resume\n", scp->unit);

Return to bug 12803