Deleted Added
full compact
39c39
< /* $FreeBSD: head/sys/dev/oce/oce_hw.h 252869 2013-07-06 08:30:45Z delphij $ */
---
> /* $FreeBSD: head/sys/dev/oce/oce_hw.h 257007 2013-10-23 18:58:38Z delphij $ */
61a62,85
>
> /********* UE Status and Mask Registers ***/
> #define PCICFG_UE_STATUS_LOW 0xA0
> #define PCICFG_UE_STATUS_HIGH 0xA4
> #define PCICFG_UE_STATUS_LOW_MASK 0xA8
>
> /* Lancer SLIPORT registers */
> #define SLIPORT_STATUS_OFFSET 0x404
> #define SLIPORT_CONTROL_OFFSET 0x408
> #define SLIPORT_ERROR1_OFFSET 0x40C
> #define SLIPORT_ERROR2_OFFSET 0x410
> #define PHYSDEV_CONTROL_OFFSET 0x414
>
> #define SLIPORT_STATUS_ERR_MASK 0x80000000
> #define SLIPORT_STATUS_DIP_MASK 0x02000000
> #define SLIPORT_STATUS_RN_MASK 0x01000000
> #define SLIPORT_STATUS_RDY_MASK 0x00800000
> #define SLI_PORT_CONTROL_IP_MASK 0x08000000
> #define PHYSDEV_CONTROL_FW_RESET_MASK 0x00000002
> #define PHYSDEV_CONTROL_DD_MASK 0x00000004
> #define PHYSDEV_CONTROL_INP_MASK 0x40000000
>
> #define SLIPORT_ERROR_NO_RESOURCE1 0x2
> #define SLIPORT_ERROR_NO_RESOURCE2 0x9
2082c2106,2107
< uint8_t rsvd[32];
---
> uint8_t asic_type_rev;
> uint8_t rsvd[31];
3684d3708
<