[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-cvs
Subject:    [IPCop-cvs] ipcop/src/install+setup/install pcmcia.c, 1.6.2.4,
From:       Gilles Espinasse <gespinasse () users ! sourceforge ! net>
Date:       2007-04-19 19:26:08
Message-ID: E1HecGg-0007g0-Iv () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/ipcop/ipcop/src/install+setup/install
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4486/src/install+setup/install

Modified Files:
      Tag: IPCOP_v1_4_0
	pcmcia.c 
Log Message:
Replace yenta_socket detection parsing with a limited PCI ID list by a modprobe
The list is too restrictive as yenta_socket support any PCI ID where class
 is set to 0x00060700.
This allow me to detect pcmcia on a Dell D600 that the previous code miss.


Index: pcmcia.c
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/install+setup/install/Attic/pcmcia.c,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -d -r1.6.2.4 -r1.6.2.5
*** pcmcia.c	8 Dec 2005 02:12:28 -0000	1.6.2.4
--- pcmcia.c	19 Apr 2007 19:26:06 -0000	1.6.2.5
***************
*** 48,104 ****
  pci_id_t pci_id[] = {
      { 0x1013, 0x1100, "i82365", "Cirrus Logic CL 6729" },
-     { 0x1013, 0x1110, "yenta_socket", "Cirrus Logic PD 6832" },
-     { 0x10b3, 0xb106, "yenta_socket", "SMC 34C90" },
-     { 0x1180, 0x0465, "yenta_socket", "Ricoh RL5C465" },
-     { 0x1180, 0x0466, "yenta_socket", "Ricoh RL5C466" },
-     { 0x1180, 0x0475, "yenta_socket", "Ricoh RL5C475" },
-     { 0x1180, 0x0476, "yenta_socket", "Ricoh RL5C476" },
-     { 0x1180, 0x0477, "yenta_socket", "Ricoh RL5C477" },
-     { 0x1180, 0x0478, "yenta_socket", "Ricoh RL5C478" },
-     { 0x104c, 0xac12, "yenta_socket", "Texas Instruments PCI1130" }, 
-     { 0x104c, 0xac13, "yenta_socket", "Texas Instruments PCI1031" }, 
-     { 0x104c, 0xac15, "yenta_socket", "Texas Instruments PCI1131" }, 
-     { 0x104c, 0xac1a, "yenta_socket", "Texas Instruments PCI1210" }, 
-     { 0x104c, 0xac1e, "yenta_socket", "Texas Instruments PCI1211" }, 
-     { 0x104c, 0xac17, "yenta_socket", "Texas Instruments PCI1220" }, 
-     { 0x104c, 0xac19, "yenta_socket", "Texas Instruments PCI1221" }, 
-     { 0x104c, 0xac1c, "yenta_socket", "Texas Instruments PCI1225" }, 
-     { 0x104c, 0xac16, "yenta_socket", "Texas Instruments PCI1250" }, 
-     { 0x104c, 0xac1d, "yenta_socket", "Texas Instruments PCI1251A" }, 
-     { 0x104c, 0xac1f, "yenta_socket", "Texas Instruments PCI1251B" }, 
-     { 0x104c, 0xac50, "yenta_socket", "Texas Instruments PCI1410" }, 
-     { 0x104c, 0xac51, "yenta_socket", "Texas Instruments PCI1420" }, 
-     { 0x104c, 0xac1b, "yenta_socket", "Texas Instruments PCI1450" }, 
-     { 0x104c, 0xac52, "yenta_socket", "Texas Instruments PCI1451" }, 
-     { 0x104c, 0xac56, "yenta_socket", "Texas Instruments PCI1510" }, 
-     { 0x104c, 0xac55, "yenta_socket", "Texas Instruments PCI1520" }, 
-     { 0x104c, 0xac54, "yenta_socket", "Texas Instruments PCI1620" }, 
-     { 0x104c, 0xac41, "yenta_socket", "Texas Instruments PCI4410" }, 
-     { 0x104c, 0xac40, "yenta_socket", "Texas Instruments PCI4450" }, 
-     { 0x104c, 0xac42, "yenta_socket", "Texas Instruments PCI4451" }, 
-     { 0x104c, 0xac44, "yenta_socket", "Texas Instruments PCI4510" }, 
-     { 0x104c, 0xac46, "yenta_socket", "Texas Instruments PCI4520" }, 
-     { 0x104c, 0xac49, "yenta_socket", "Texas Instruments PCI7410" }, 
-     { 0x104c, 0xac47, "yenta_socket", "Texas Instruments PCI7510" }, 
-     { 0x104c, 0xac48, "yenta_socket", "Texas Instruments PCI7610" }, 
      { 0x1217, 0x6729, "i82365", "O2 Micro 6729" }, 
      { 0x1217, 0x673a, "i82365", "O2 Micro 6730" }, 
-     { 0x1217, 0x6832, "yenta_socket", "O2 Micro 6832/6833" }, 
-     { 0x1217, 0x6836, "yenta_socket", "O2 Micro 6836/6860" }, 
-     { 0x1217, 0x6872, "yenta_socket", "O2 Micro 6812" }, 
-     { 0x1217, 0x6925, "yenta_socket", "O2 Micro 6922" }, 
-     { 0x1217, 0x6933, "yenta_socket", "O2 Micro 6933" }, 
-     { 0x1217, 0x6972, "yenta_socket", "O2 Micro 6912" }, 
      { 0x1179, 0x0603, "i82365", "Toshiba ToPIC95-A" }, 
-     { 0x1179, 0x060a, "yenta_socket", "Toshiba ToPIC95-B" }, 
-     { 0x1179, 0x060f, "yenta_socket", "Toshiba ToPIC97" }, 
-     { 0x1179, 0x0617, "yenta_socket", "Toshiba ToPIC100" }, 
      { 0x119b, 0x1221, "i82365", "Omega Micro 82C092G" }, 
      { 0x8086, 0x1221, "i82092", "Intel 82092AA_0" }, 
      { 0x8086, 0x1222, "i82092", "Intel 82092AA_1" }, 
-     { 0x1524, 0x1211, "yenta_socket", "ENE 1211" },
-     { 0x1524, 0x1225, "yenta_socket", "ENE 1225" },
-     { 0x1524, 0x1410, "yenta_socket", "ENE 1410" },
-     { 0x1524, 0x1420, "yenta_socket", "ENE 1420" },
  };
  #define PCI_COUNT (sizeof(pci_id)/sizeof(pci_id_t))
--- 48,57 ----
***************
*** 319,322 ****
--- 272,280 ----
  	return "tcic";
  #endif
+     else 
+ 	/* a limited list of pci id is not enought as
+ 	 * yenta_socket recognize any ID with class 0x00060700 */
+ 	if (modprobe("yenta_socket") == 0)
+ 		return "yenta_socket";
      else {
      	/* Detect ISAPNP based i82365 controllers */


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
IPCop-cvs mailing list
IPCop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-cvs
[prev in list] [next in list] [prev in thread] [next in thread]