diff options
| -rw-r--r-- | sys/pccard/pcic_pci.c | 36 | ||||
| -rw-r--r-- | sys/pccard/pcic_pci.h | 21 | ||||
| -rw-r--r-- | sys/pci/pcic_p.c | 36 | ||||
| -rw-r--r-- | sys/pci/pcic_p.h | 21 |
4 files changed, 88 insertions, 26 deletions
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c index 60c3f42..a97588c 100644 --- a/sys/pccard/pcic_pci.c +++ b/sys/pccard/pcic_pci.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcic_p.c,v 1.7 1998/12/14 06:32:57 dillon Exp $ + * $Id: pcic_p.c,v 1.8 1999/01/25 12:59:31 torstenb Exp $ */ #include "pci.h" @@ -67,16 +67,38 @@ static const char * pcic_pci_probe(pcici_t tag, pcidi_t type) { switch (type) { - case PCI_DEVICE_ID_PCIC_CLPD6729: - return ("Cirrus Logic PD6729/6730 PC-Card Controller"); case PCI_DEVICE_ID_PCIC_CLPD6832: - return ("Cirrus Logic PD6832 CardBus Adapter"); + return ("Cirrus Logic PD6832 PCI/CardBus Bridge"); case PCI_DEVICE_ID_PCIC_TI1130: - return ("TI 1130 PCMCIA/CardBus Bridge"); + return ("TI PCI-1130 PCI-CardBus Bridge"); case PCI_DEVICE_ID_PCIC_TI1131: - return ("TI 1131 PCI to PCMCIA/CardBus bridge"); + return ("TI PCI-1131 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_PCIC_TI1220: + return ("TI PCI-1220 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_PCIC_TI1221: + return ("TI PCI-1221 PCI-CardBus Bridge"); case PCI_DEVICE_ID_PCIC_TI1250: - return ("TI 1250 PCI to PCMCIA/CardBus bridge"); + return ("TI PCI-1250 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_TOSHIBA_TOPIC95: + return ("Toshiba ToPIC95 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_TOSHIBA_TOPIC97: + return ("Toshiba ToPIC97 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_RICOH_RL5C465: + return ("Ricoh RL5C465 PCI-CardBus Brige"); + case PCI_DEVICE_ID_RICOH_RL5C475: + return ("Ricoh RL5C475 PCI-CardBus Brige"); + case PCI_DEVICE_ID_RICOH_RL5C476: + return ("Ricoh RL5C476 PCI-CardBus Brige"); + case PCI_DEVICE_ID_RICOH_RL5C478: + return ("Ricoh RL5C478 PCI-CardBus Brige"); + /* 16bit PC-card bridges */ + case PCI_DEVICE_ID_PCIC_CLPD6729: + return ("Cirrus Logic PD6729/6730 PC-Card Controller"); + case PCI_DEVICE_ID_PCIC_OZ6729: + return ("O2micro OZ6729 PC-Card Bridge"); + case PCI_DEVICE_ID_PCIC_OZ6730: + return ("O2micro OZ6730 PC-Card Bridge"); + default: break; } diff --git a/sys/pccard/pcic_pci.h b/sys/pccard/pcic_pci.h index 8b2bc27..855e1ab2 100644 --- a/sys/pccard/pcic_pci.h +++ b/sys/pccard/pcic_pci.h @@ -26,17 +26,26 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcic_p.h,v 1.3 1998/01/20 21:11:03 nate Exp $ + * $Id: pcic_p.h,v 1.4 1999/01/25 12:59:31 torstenb Exp $ */ /* PCI/CardBus Device IDs */ +#define PCI_DEVICE_ID_PCIC_OZ6729 0x67291217ul +#define PCI_DEVICE_ID_PCIC_OZ6730 0x673A1217ul #define PCI_DEVICE_ID_PCIC_CLPD6729 0x11001013ul #define PCI_DEVICE_ID_PCIC_CLPD6832 0x11101013ul -#define PCI_DEVICE_ID_PCIC_O2MICRO 0x673A1217ul -#define PCI_DEVICE_ID_PCIC_TI1130 0xAC12104Cul -#define PCI_DEVICE_ID_PCIC_TI1131 0xAC15104Cul -#define PCI_DEVICE_ID_PCIC_TI1250 0xAC16104Cul - +#define PCI_DEVICE_ID_PCIC_TI1130 0xac12104cul +#define PCI_DEVICE_ID_PCIC_TI1131 0xac15104cul +#define PCI_DEVICE_ID_PCIC_TI1220 0xac17104cul +#define PCI_DEVICE_ID_PCIC_TI1221 0xac19104cul +#define PCI_DEVICE_ID_PCIC_TI1250 0xac16104cul +#define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a1179ul +#define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f1179ul +#define PCI_DEVICE_ID_RICOH_RL5C465 0x04651180ul +#define PCI_DEVICE_ID_RICOH_RL5C475 0x04751180ul +#define PCI_DEVICE_ID_RICOH_RL5C476 0x04761180ul +#define PCI_DEVICE_ID_RICOH_RL5C478 0x04781180ul + /* CL-PD6832 CardBus defines */ #define CLPD6832_IO_BASE0 0x002c #define CLPD6832_IO_LIMIT0 0x0030 diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c index 60c3f42..a97588c 100644 --- a/sys/pci/pcic_p.c +++ b/sys/pci/pcic_p.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcic_p.c,v 1.7 1998/12/14 06:32:57 dillon Exp $ + * $Id: pcic_p.c,v 1.8 1999/01/25 12:59:31 torstenb Exp $ */ #include "pci.h" @@ -67,16 +67,38 @@ static const char * pcic_pci_probe(pcici_t tag, pcidi_t type) { switch (type) { - case PCI_DEVICE_ID_PCIC_CLPD6729: - return ("Cirrus Logic PD6729/6730 PC-Card Controller"); case PCI_DEVICE_ID_PCIC_CLPD6832: - return ("Cirrus Logic PD6832 CardBus Adapter"); + return ("Cirrus Logic PD6832 PCI/CardBus Bridge"); case PCI_DEVICE_ID_PCIC_TI1130: - return ("TI 1130 PCMCIA/CardBus Bridge"); + return ("TI PCI-1130 PCI-CardBus Bridge"); case PCI_DEVICE_ID_PCIC_TI1131: - return ("TI 1131 PCI to PCMCIA/CardBus bridge"); + return ("TI PCI-1131 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_PCIC_TI1220: + return ("TI PCI-1220 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_PCIC_TI1221: + return ("TI PCI-1221 PCI-CardBus Bridge"); case PCI_DEVICE_ID_PCIC_TI1250: - return ("TI 1250 PCI to PCMCIA/CardBus bridge"); + return ("TI PCI-1250 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_TOSHIBA_TOPIC95: + return ("Toshiba ToPIC95 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_TOSHIBA_TOPIC97: + return ("Toshiba ToPIC97 PCI-CardBus Bridge"); + case PCI_DEVICE_ID_RICOH_RL5C465: + return ("Ricoh RL5C465 PCI-CardBus Brige"); + case PCI_DEVICE_ID_RICOH_RL5C475: + return ("Ricoh RL5C475 PCI-CardBus Brige"); + case PCI_DEVICE_ID_RICOH_RL5C476: + return ("Ricoh RL5C476 PCI-CardBus Brige"); + case PCI_DEVICE_ID_RICOH_RL5C478: + return ("Ricoh RL5C478 PCI-CardBus Brige"); + /* 16bit PC-card bridges */ + case PCI_DEVICE_ID_PCIC_CLPD6729: + return ("Cirrus Logic PD6729/6730 PC-Card Controller"); + case PCI_DEVICE_ID_PCIC_OZ6729: + return ("O2micro OZ6729 PC-Card Bridge"); + case PCI_DEVICE_ID_PCIC_OZ6730: + return ("O2micro OZ6730 PC-Card Bridge"); + default: break; } diff --git a/sys/pci/pcic_p.h b/sys/pci/pcic_p.h index 8b2bc27..855e1ab2 100644 --- a/sys/pci/pcic_p.h +++ b/sys/pci/pcic_p.h @@ -26,17 +26,26 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcic_p.h,v 1.3 1998/01/20 21:11:03 nate Exp $ + * $Id: pcic_p.h,v 1.4 1999/01/25 12:59:31 torstenb Exp $ */ /* PCI/CardBus Device IDs */ +#define PCI_DEVICE_ID_PCIC_OZ6729 0x67291217ul +#define PCI_DEVICE_ID_PCIC_OZ6730 0x673A1217ul #define PCI_DEVICE_ID_PCIC_CLPD6729 0x11001013ul #define PCI_DEVICE_ID_PCIC_CLPD6832 0x11101013ul -#define PCI_DEVICE_ID_PCIC_O2MICRO 0x673A1217ul -#define PCI_DEVICE_ID_PCIC_TI1130 0xAC12104Cul -#define PCI_DEVICE_ID_PCIC_TI1131 0xAC15104Cul -#define PCI_DEVICE_ID_PCIC_TI1250 0xAC16104Cul - +#define PCI_DEVICE_ID_PCIC_TI1130 0xac12104cul +#define PCI_DEVICE_ID_PCIC_TI1131 0xac15104cul +#define PCI_DEVICE_ID_PCIC_TI1220 0xac17104cul +#define PCI_DEVICE_ID_PCIC_TI1221 0xac19104cul +#define PCI_DEVICE_ID_PCIC_TI1250 0xac16104cul +#define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a1179ul +#define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f1179ul +#define PCI_DEVICE_ID_RICOH_RL5C465 0x04651180ul +#define PCI_DEVICE_ID_RICOH_RL5C475 0x04751180ul +#define PCI_DEVICE_ID_RICOH_RL5C476 0x04761180ul +#define PCI_DEVICE_ID_RICOH_RL5C478 0x04781180ul + /* CL-PD6832 CardBus defines */ #define CLPD6832_IO_BASE0 0x002c #define CLPD6832_IO_LIMIT0 0x0030 |
