diff options
Diffstat (limited to 'drivers/net/dl2k.h')
-rw-r--r-- | drivers/net/dl2k.h | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h index c8aacf2ff8da..5f00ecb4a280 100644 --- a/drivers/net/dl2k.h +++ b/drivers/net/dl2k.h | |||
@@ -385,19 +385,6 @@ enum _mii_aner { | |||
385 | }; | 385 | }; |
386 | 386 | ||
387 | /* MASTER-SLAVE Control Register */ | 387 | /* MASTER-SLAVE Control Register */ |
388 | typedef union t_MII_MSCR { | ||
389 | u16 image; | ||
390 | struct { | ||
391 | u16 _bit_7_0:8; // bit 7:0 | ||
392 | u16 media_1000BT_HD:1; // bit 8 | ||
393 | u16 media_1000BT_FD:1; // bit 9 | ||
394 | u16 port_type:1; // bit 10 | ||
395 | u16 cfg_value:1; // bit 11 | ||
396 | u16 cfg_enable:1; // bit 12 | ||
397 | u16 test_mode:3; // bit 15:13 | ||
398 | } bits; | ||
399 | } MSCR_t, *PMSCR_t; | ||
400 | |||
401 | enum _mii_mscr { | 388 | enum _mii_mscr { |
402 | MII_MSCR_TEST_MODE = 0xe000, | 389 | MII_MSCR_TEST_MODE = 0xe000, |
403 | MII_MSCR_CFG_ENABLE = 0x1000, | 390 | MII_MSCR_CFG_ENABLE = 0x1000, |
@@ -408,20 +395,6 @@ enum _mii_mscr { | |||
408 | }; | 395 | }; |
409 | 396 | ||
410 | /* MASTER-SLAVE Status Register */ | 397 | /* MASTER-SLAVE Status Register */ |
411 | typedef union t_MII_MSSR { | ||
412 | u16 image; | ||
413 | struct { | ||
414 | u16 idle_err_count:8; // bit 7:0 | ||
415 | u16 _bit_9_8:2; // bit 9:8 | ||
416 | u16 lp_1000BT_HD:1; // bit 10 | ||
417 | u16 lp_1000BT_FD:1; // bit 11 | ||
418 | u16 remote_rcv_status:1; // bit 12 | ||
419 | u16 local_rcv_status:1; // bit 13 | ||
420 | u16 cfg_resolution:1; // bit 14 | ||
421 | u16 cfg_fault:1; // bit 15 | ||
422 | } bits; | ||
423 | } MSSR_t, *PMSSR_t; | ||
424 | |||
425 | enum _mii_mssr { | 398 | enum _mii_mssr { |
426 | MII_MSSR_CFG_FAULT = 0x8000, | 399 | MII_MSSR_CFG_FAULT = 0x8000, |
427 | MII_MSSR_CFG_RES = 0x4000, | 400 | MII_MSSR_CFG_RES = 0x4000, |
@@ -433,17 +406,6 @@ enum _mii_mssr { | |||
433 | }; | 406 | }; |
434 | 407 | ||
435 | /* IEEE Extened Status Register */ | 408 | /* IEEE Extened Status Register */ |
436 | typedef union t_MII_ESR { | ||
437 | u16 image; | ||
438 | struct { | ||
439 | u16 _bit_11_0:12; // bit 11:0 | ||
440 | u16 media_1000BT_HD:2; // bit 12 | ||
441 | u16 media_1000BT_FD:1; // bit 13 | ||
442 | u16 media_1000BX_HD:1; // bit 14 | ||
443 | u16 media_1000BX_FD:1; // bit 15 | ||
444 | } bits; | ||
445 | } ESR_t, *PESR_t; | ||
446 | |||
447 | enum _mii_esr { | 409 | enum _mii_esr { |
448 | MII_ESR_1000BX_FD = 0x8000, | 410 | MII_ESR_1000BX_FD = 0x8000, |
449 | MII_ESR_1000BX_HD = 0x4000, | 411 | MII_ESR_1000BX_HD = 0x4000, |
@@ -451,6 +413,7 @@ enum _mii_esr { | |||
451 | MII_ESR_1000BT_HD = 0x1000, | 413 | MII_ESR_1000BT_HD = 0x1000, |
452 | }; | 414 | }; |
453 | /* PHY Specific Control Register */ | 415 | /* PHY Specific Control Register */ |
416 | #if 0 | ||
454 | typedef union t_MII_PHY_SCR { | 417 | typedef union t_MII_PHY_SCR { |
455 | u16 image; | 418 | u16 image; |
456 | struct { | 419 | struct { |
@@ -468,6 +431,7 @@ typedef union t_MII_PHY_SCR { | |||
468 | u16 xmit_fifo_depth:2; // bit 15:14 | 431 | u16 xmit_fifo_depth:2; // bit 15:14 |
469 | } bits; | 432 | } bits; |
470 | } PHY_SCR_t, *PPHY_SCR_t; | 433 | } PHY_SCR_t, *PPHY_SCR_t; |
434 | #endif | ||
471 | 435 | ||
472 | typedef enum t_MII_ADMIN_STATUS { | 436 | typedef enum t_MII_ADMIN_STATUS { |
473 | adm_reset, | 437 | adm_reset, |