Add #define for IBM3765.

Fix SWAMPBOX.  It had actiontec's ID.
Reorder pnpids so they are in alphabetical order.
This commit is contained in:
Warner Losh 2001-04-11 20:18:29 +00:00
parent 0b5438c6d1
commit e5eac10b13
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=75425
2 changed files with 5 additions and 6 deletions

View File

@ -352,10 +352,10 @@
#define PCIC_CIRRUS_EXT_CONTROL_1_PCI_INTR_MASK 0x18
/* Plug and play */
#define PCIC_PNP_ACTIONTEC 0x1802A904 /* AEI0218 */
#define PCIC_PNP_IBM3765 0x65374d24 /* IBM3765 */
#define PCIC_PNP_82365 0x000ED041 /* PNP0E00 */
#define PCIC_PNP_CL_PD6720 0x010ED041 /* PNP0E01 */
#define PCIC_PNP_VLSI_82C146 0x020ED041 /* PNP0E02 */
#define PCIC_PNP_82365_CARDBUS 0x030ED041 /* PNP0E03 */
#define PCIC_PNP_ACTIONTEC 0x1802A904 /* AEI0218 */
#define PCIC_PNP_SCM_SWAPBOX 0x1802A904 /* SCM0469 */
#define PCIC_PNP_SCM_SWAPBOX2 0x69046d4c /* SCM SwapBox Classic X2P */
#define PCIC_PNP_SCM_SWAPBOX 0x69046d4c /* SMC0469 */

View File

@ -79,14 +79,13 @@ static struct pcic_slot {
static struct slot_ctrl cinfo;
static struct isa_pnp_id pcic_ids[] = {
{0x65374d24, NULL}, /* IBM3765 */
{PCIC_PNP_ACTIONTEC, NULL}, /* AEI0218 */
{PCIC_PNP_IBM3765, NULL}, /* IBM3765 */
{PCIC_PNP_82365, NULL}, /* PNP0E00 */
{PCIC_PNP_CL_PD6720, NULL}, /* PNP0E01 */
{PCIC_PNP_VLSI_82C146, NULL}, /* PNP0E02 */
{PCIC_PNP_82365_CARDBUS, NULL}, /* PNP0E03 */
{PCIC_PNP_ACTIONTEC, NULL}, /* AEI0218 */
{PCIC_PNP_SCM_SWAPBOX, NULL}, /* SCM0469 */
{PCIC_PNP_SCM_SWAPBOX2, NULL}, /* SCM SwapBox Classic X2P */
{0}
};