Char: mxser_new, upgrade to 1.10
Subsystems (2)
PATCH 1/3 Char: mxser_new, upgrade to 1.10
mxser_new, upgrade to 1.10
This adds support for new (5 cards) hardware.
---
commit 77a1c21e95d4f0eb4f4dc1d98463bb4046e033bd
tree 55c2e4011ca5e49455061d03d1c8756e790a1360
parent 7129cd56f4f7f8d9f7cc9deb9a62291fc989cf91
author Jiri Slaby <[email protected]> Sun, 12 Aug 2007 17:19:23 +0200 committer Jiri Slaby <[email protected]> Sun, 12 Aug 2007 17:19:23 +0200
drivers/char/mxser_new.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-)
drivers/char/mxser_new.c +24 -8
@@ -2,7 +2,7 @@* mxser.c -- MOXA Smartio/Industio family multiport serial driver. * * Copyright (C) 1999-2006 Moxa Technologies ([email protected]). -* Copyright (C) 2006 Jiri Slaby <[email protected]> +* Copyright (C) 2006-2007 Jiri Slaby <[email protected]> * * This code is loosely based on the 1.8 moxa driver which is based on * Linux serial driver, written by Linus Torvalds, Theodore T'so and
@@ -48,7 +48,7 @@#include "mxser_new.h" -#define MXSER_VERSION "2.0.1"/* 1.9.15 */ +#define MXSER_VERSION "2.0.2"/* 1.10 */ #define MXSERMAJOR 174#define MXSERCUMAJOR 175
@@ -72,6 +72,12 @@#define UART_MCR_AFE 0x20#define UART_LSR_SPECIAL 0x1E +#define PCI_DEVICE_ID_CB108 0x1080 +#define PCI_DEVICE_ID_CB114 0x1142 +#define PCI_DEVICE_ID_CB134I 0x1341 +#define PCI_DEVICE_ID_CP138U 0x1380 +#define PCI_DEVICE_ID_POS104UL 0x1044 +#define C168_ASIC_ID 1#define C104_ASIC_ID 2
@@ -107,30 +113,35 @@ struct mxser_cardinfo { };static const struct mxser_cardinfo mxser_cards[] = { - {8 ,"C168 series" , },/* C168-ISA */ +/* 0*/ {8 ,"C168 series" , },/* C168-ISA */ {4 ,"C104 series" , },/* C104-ISA */ {4 ,"CI-104J series" , },/* CI104J */ {8 ,"C168H/PCI series" , },/* C168-PCI */ {4 ,"C104H/PCI series" , },/* C104-PCI */ - {4 ,"C102 series" ,MXSER_HAS2 },/* C102-ISA */ +/* 5*/ {4 ,"C102 series" ,MXSER_HAS2 },/* C102-ISA */ {4 ,"CI-132 series" ,MXSER_HAS2 },/* CI132 */ {4 ,"CI-134 series" , },/* CI134 */ {2 ,"CP-132 series" , },/* CP132 */ {4 ,"CP-114 series" , },/* CP114 */ - {4 ,"CT-114 series" , },/* CT114 */ +/*10*/ {4 ,"CT-114 series" , },/* CT114 */ {2 ,"CP-102 series" ,MXSER_HIGHBAUD },/* CP102 */ {4 ,"CP-104U series" , },/* CP104U */ {8 ,"CP-168U series" , },/* CP168U */ {2 ,"CP-132U series" , },/* CP132U */ - {4 ,"CP-134U series" , },/* CP134U */ +/*15*/ {4 ,"CP-134U series" , },/* CP134U */ {4 ,"CP-104JU series" , },/* CP104JU */ {8 ,"Moxa UC7000 Serial" , },/* RC7000 */ {8 ,"CP-118U series" , },/* CP118U */ {2 ,"CP-102UL series" , },/* CP102UL */ - {2 ,"CP-102U series" , },/* CP102U */ +/*20*/ {2 ,"CP-102U series" , },/* CP102U */ {8 ,"CP-118EL series" , },/* CP118EL */ {8 ,"CP-168EL series" , },/* CP168EL */ - {4 ,"CP-104EL series" , }/* CP104EL */ + {4 ,"CP-104EL series" , }, + {8 ,"CB-108 series" , }, +/*25*/ {4 ,"CB-114 series" , }, + {4 ,"CB-134I series" , }, + {8 ,"CP-138U series" , }, + {4 ,"POS-104UL series" , } };/* driver_data correspond to the lines in the structure above
@@ -172,6 +183,11 @@ static struct pci_device_id mxser_pcibrds[] = { .driver_data = 22 }, { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL), .driver_data = 23 }, + { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB108), .driver_data = 24 }, + { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB114), .driver_data = 25 }, + { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CB134I), .driver_data = 26 }, + { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP138U), .driver_data = 27 }, + { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL), .driver_data = 28 }, { } };MODULE_DEVICE_TABLE (pci, mxser_pcibrds);
PATCH 2/3 Char: mxser_new, move to PCI_VDEVICE
mxser_new, move to PCI_VDEVICE
---
commit 49b870ecc51c0e1aeb28ae329d825e9ca35cc973
tree 3beb5439b988f082464f1a8bc805e43c1afd1753
parent 77a1c21e95d4f0eb4f4dc1d98463bb4046e033bd
author Jiri Slaby <[email protected]> Sun, 12 Aug 2007 17:16:03 +0200 committer Jiri Slaby <[email protected]> Sun, 12 Aug 2007 17:19:57 +0200
drivers/char/mxser_new.c | 54 +++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 36 deletions(-)
drivers/char/mxser_new.c +18 -36
@@ -147,42 +147,24 @@ static const struct mxser_cardinfo mxser_cards[] = {/* driver_data correspond to the lines in the structure above see also ISA probe function before you change something */ static struct pci_device_id mxser_pcibrds[] = { - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_C168 ), - .driver_data =3 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_C104 ), - .driver_data =4 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP132 ), - .driver_data =8 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP114 ), - .driver_data =9 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CT114 ), - .driver_data =10 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP102 ), - .driver_data =11 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP104U ), - .driver_data =12 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP168U ), - .driver_data =13 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP132U ), - .driver_data =14 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP134U ), - .driver_data =15 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP104JU ), - .driver_data =16 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_RC7000 ), - .driver_data =17 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP118U ), - .driver_data =18 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP102UL ), - .driver_data =19 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP102U ), - .driver_data =20 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP118EL ), - .driver_data =21 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP168EL ), - .driver_data =22 }, - {PCI_DEVICE (PCI_VENDOR_ID_MOXA ,PCI_DEVICE_ID_MOXA_CP104EL ), - .driver_data =23 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_C168 ), .driver_data =3 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_C104 ), .driver_data =4 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP132 ), .driver_data =8 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP114 ), .driver_data =9 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CT114 ), .driver_data =10 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP102 ), .driver_data =11 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP104U ), .driver_data =12 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP168U ), .driver_data =13 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP132U ), .driver_data =14 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP134U ), .driver_data =15 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP104JU ),.driver_data =16 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_RC7000 ), .driver_data =17 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP118U ), .driver_data =18 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP102UL ),.driver_data =19 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP102U ), .driver_data =20 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP118EL ),.driver_data =21 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP168EL ),.driver_data =22 }, + {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_MOXA_CP104EL ),.driver_data =23 }, {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_CB108 ), .driver_data =24 }, {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_CB114 ), .driver_data =25 }, {PCI_VDEVICE (MOXA ,PCI_DEVICE_ID_CB134I ), .driver_data =26 },
PATCH 3/3 Char: mxser_new, remove useless comments in mxser_cards
In reply to Jiri Slabymxser_new, remove useless comments in mxser_cards
It was rest from times, where info about the card was separated (name, ports number and flags).
---
commit edbf03cecb93301ce1087ebbf46811c2c3af6534
tree f0bc804634fa587efed972a98c679859469494c9
parent 49b870ecc51c0e1aeb28ae329d825e9ca35cc973
author Jiri Slaby <[email protected]> Sun, 12 Aug 2007 17:23:04 +0200 committer Jiri Slaby <[email protected]> Sun, 12 Aug 2007 17:23:04 +0200
drivers/char/mxser_new.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
drivers/char/mxser_new.c +21 -21
@@ -113,29 +113,29 @@ struct mxser_cardinfo { };static const struct mxser_cardinfo mxser_cards[] = { -/* 0*/ {8 ,"C168 series" , },/* C168-ISA */ - {4 ,"C104 series" , },/* C104-ISA */ - {4 ,"CI-104J series" , },/* CI104J */ - {8 ,"C168H/PCI series" , },/* C168-PCI */ - {4 ,"C104H/PCI series" , },/* C104-PCI */ +/* 0*/ {8 ,"C168 series" , }, + {4 ,"C104 series" , }, + {4 ,"CI-104J series" , }, + {8 ,"C168H/PCI series" , }, + {4 ,"C104H/PCI series" , },/* 5*/ {4 ,"C102 series" ,MXSER_HAS2 },/* C102-ISA */ - {4 ,"CI-132 series" ,MXSER_HAS2 },/* CI132 */ - {4 ,"CI-134 series" , },/* CI134 */ - {2 ,"CP-132 series" , },/* CP132 */ - {4 ,"CP-114 series" , },/* CP114 */ -/*10*/ {4 ,"CT-114 series" , },/* CT114 */ - {2 ,"CP-102 series" ,MXSER_HIGHBAUD },/* CP102 */ - {4 ,"CP-104U series" , },/* CP104U */ - {8 ,"CP-168U series" , },/* CP168U */ - {2 ,"CP-132U series" , },/* CP132U */ -/*15*/ {4 ,"CP-134U series" , },/* CP134U */ - {4 ,"CP-104JU series" , },/* CP104JU */ + {4 ,"CI-132 series" ,MXSER_HAS2 }, + {4 ,"CI-134 series" , }, + {2 ,"CP-132 series" , }, + {4 ,"CP-114 series" , }, +/*10*/ {4 ,"CT-114 series" , }, + {2 ,"CP-102 series" ,MXSER_HIGHBAUD }, + {4 ,"CP-104U series" , }, + {8 ,"CP-168U series" , }, + {2 ,"CP-132U series" , }, +/*15*/ {4 ,"CP-134U series" , }, + {4 ,"CP-104JU series" , }, {8 ,"Moxa UC7000 Serial" , },/* RC7000 */ - {8 ,"CP-118U series" , },/* CP118U */ - {2 ,"CP-102UL series" , },/* CP102UL */ -/*20*/ {2 ,"CP-102U series" , },/* CP102U */ - {8 ,"CP-118EL series" , },/* CP118EL */ - {8 ,"CP-168EL series" , },/* CP168EL */ + {8 ,"CP-118U series" , }, + {2 ,"CP-102UL series" , }, +/*20*/ {2 ,"CP-102U series" , }, + {8 ,"CP-118EL series" , }, + {8 ,"CP-168EL series" , }, {4 ,"CP-104EL series" , }, {8 ,"CB-108 series" , },/*25*/ {4 ,"CB-114 series" , },