diff options
| author | Michael Brown | 2008-10-24 00:35:01 +0200 |
|---|---|---|
| committer | Michael Brown | 2008-10-24 04:52:17 +0200 |
| commit | d4c8273569b4452fe3a6f2f90557655bceeb1aa3 (patch) | |
| tree | ebacd58930bdaca8aabda0162e511167f13fb60e /src/drivers/net/phantom/phantom.h | |
| parent | [pcbios] Guard against register corruption in INT 15,e820 implementations (diff) | |
| download | ipxe-d4c8273569b4452fe3a6f2f90557655bceeb1aa3.tar.gz ipxe-d4c8273569b4452fe3a6f2f90557655bceeb1aa3.tar.xz ipxe-d4c8273569b4452fe3a6f2f90557655bceeb1aa3.zip | |
[phantom] Change register space abstraction to match other drivers
Most other Phantom drivers define a register space in terms of a 64M
virtual address space. While this doesn't map in any meaningful way
to the actual addresses used on the latest cards, it makes maintenance
easier if we do the same.
Diffstat (limited to 'src/drivers/net/phantom/phantom.h')
| -rw-r--r-- | src/drivers/net/phantom/phantom.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/net/phantom/phantom.h b/src/drivers/net/phantom/phantom.h index 110c12262..c43bac836 100644 --- a/src/drivers/net/phantom/phantom.h +++ b/src/drivers/net/phantom/phantom.h @@ -76,14 +76,14 @@ typedef uint32_t nx_rcode_t; * address by the phantom_crb_access_xxx() methods. */ enum unm_reg_blocks { - UNM_CRB_BLK_PCIE, - UNM_CRB_BLK_CAM, - UNM_CRB_BLK_ROMUSB, - UNM_CRB_BLK_TEST, + UNM_CRB_BLK_PCIE = 0x01, + UNM_CRB_BLK_CAM = 0x22, + UNM_CRB_BLK_ROMUSB = 0x33, + UNM_CRB_BLK_TEST = 0x02, }; -#define UNM_CRB_BASE(blk) ( (blk) << 24 ) -#define UNM_CRB_BLK(reg) ( (reg) >> 24 ) -#define UNM_CRB_OFFSET(reg) ( (reg) & 0x00ffffff ) +#define UNM_CRB_BASE(blk) ( (blk) << 20 ) +#define UNM_CRB_BLK(reg) ( (reg) >> 20 ) +#define UNM_CRB_OFFSET(reg) ( (reg) & 0x000fffff ) #define UNM_CRB_PCIE UNM_CRB_BASE ( UNM_CRB_BLK_PCIE ) #define UNM_PCIE_SEM2_LOCK ( UNM_CRB_PCIE + 0x1c010 ) |