--- sys/isa/sio.c +++ sys/isa/sio.c @@ -602,7 +602,6 @@ { 0x95211415, "Oxford Semiconductor PCI Dual Port Serial", 0x10 }, { 0x7101135e, "SeaLevel Ultra 530.PCI Single Port Serial", 0x18 }, { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, - { 0x98459710, "Netmos Nm9845 PCI Bridge with Dual UART", 0x10 }, { 0x00000000, NULL, 0 } }; --- sys/pc98/pc98/sio.c +++ sys/pc98/pc98/sio.c @@ -978,7 +978,6 @@ { 0x95211415, "Oxford Semiconductor PCI Dual Port Serial", 0x10 }, { 0x7101135e, "SeaLevel Ultra 530.PCI Single Port Serial", 0x18 }, { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, - { 0x98459710, "Netmos Nm9845 PCI Bridge with Dual UART", 0x10 }, { 0x00000000, NULL, 0 } }; --- share/man/man4/sio.4 +++ share/man/man4/sio.4 @@ -62,15 +62,6 @@ .Cd "..." .Cd "device sio11 at isa? port 0x138 flags 0xb05 irq 12" .Pp -For Netmos Nm9845 multiport cards with 6 ports: -.Cd "options COM_MULTIPORT" -.Cd "device sio4 at isa? port 0xb000 flags 0x901" -.Cd "device sio5 at isa? port 0xb400 flags 0x901" -.Cd "device sio6 at isa? port 0xb800 flags 0x901" -.Cd "device sio7 at isa? port 0xbc00 flags 0x901" -.Cd "device sio8 at isa? port 0xc000 flags 0x901" -.Cd "device sio9 at isa? port 0xac00 flags 0x901 irq 12" -.Pp For Hayes ESP cards: .Cd "options COM_ESP" .Cd "..." --- sys/dev/puc/pucdata.c +++ sys/dev/puc/pucdata.c @@ -891,8 +891,9 @@ }, }, - /* NetMos 4S0P PCI: 4S, 0P */ - { "NetMos NM9845 Quad UART", + /* NetMos 2S PCI 9845 + 4S ISA 16C554 */ + /* What if another hardware on ISA XXXX */ + { "NetMos NM9845 2 UART + 4S ISA 16C554", { 0x9710, 0x9845, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -900,6 +901,8 @@ { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ }, }, },