[PATCH] PnP BIOS: bugfixes

--TakKZr9L6Hm6aLOc
Content-Type: multipart/mixed; boundary="d6Gm4EdcadzBjdND"
Content-Disposition: inline

--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

this patch (2.4.6-ac5) fixed two significant bugs in PnP BIOS enumeration c=
ode:
	- pnpbios_build_devlist() doesn't check pnp_bios_get_dev_node() return code
	and always builds device list with approximately 250 bogus entries;
	- pnpid32_to_pnpid() function generates bogus strings instead of PNPxxxx.

Patch tested on my machine using parport_pc module.

BTW why pnpid32_to_pnpid() builds device ID using lovercase chars like PNP0=
c01,
may be PNP0C01 will be better ?

Best regards.

--=20
Andrey Panin            | Embedded systems software engineer
[e-mail]        | PGP key: http://www.orbita1.ru/~pazke/AndreyPanin=
.asc
--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-pnpBIOS
Content-Transfer-Encoding: quoted-printable

diff -urN -X /usr/dontdiff /linux.vanilla/drivers/pnp/pnp_bios.c /linux/dri=
vers/pnp/pnp_bios.c
--- /linux.vanilla/drivers/pnp/pnp_bios.c	Tue Jul 17 23:11:14 2001
+++ /linux/drivers/pnp/pnp_bios.c	Tue Jul 17 23:40:26 2001
@@ -695,16 +695,16 @@
 	const char *hex =3D "0123456789abcdef";
         static char str[8];
 	id =3D cpu_to_le32(id);
-	str[0] =3D CHAR(id, 26);
-	str[1] =3D CHAR(id, 21);
-	str[2] =3D CHAR(id,16);
-	str[3] =3D HEX(id, 12);
-	str[4] =3D HEX(id, 8);
-	str[5] =3D HEX(id, 4);
-	str[6] =3D HEX(id, 0);
+	str[0] =3D CHAR(id, 2);
+	str[1] =3D CHAR((((id & 3) << 3) | ((id >> 13) & 7)), 0);
+	str[2] =3D CHAR(id, 8);
+	str[3] =3D HEX(id, 20);
+	str[4] =3D HEX(id, 16);
+	str[5] =3D HEX(id, 28);
+	str[6] =3D HEX(id, 24);
 	str[7] =3D '\0';
 	return str;
-}                                             =20
+}
=20
 #undef CHAR
 #undef HEX =20
@@ -728,7 +728,7 @@
 =20
 static void __init pnpbios_build_devlist(void)
 {
-	int i;
+	int i, devs =3D 0;
 	struct pnp_bios_node *node;
         struct pnp_dev_node_info node_info;
 	struct pci_dev *dev;
@@ -746,13 +746,15 @@
         if (!node)
                 return;
=20
-	for(i=3D0;i<0xff;i++)
-	{
+	for(i=3D0;i<0xff;i++) {
 		dev =3D  kmalloc(sizeof (struct pci_dev), GFP_KERNEL);
 		if (!dev)
 			break;
 		=09
-                pnp_bios_get_dev_node((u8 *)&num, (char )0 , node);
+                if (pnp_bios_get_dev_node((u8 *)&num, (char )0 , node))
+			continue;
+
+		devs++;
 		pnpbios_rawdata_2_pci_dev(node,dev);
 		dev->devfn=3Dnum;
 		pnpid =3D pnpid32_to_pnpid(node->eisa_id);
@@ -762,6 +764,11 @@
 			kfree(dev);
 	}
 	kfree(node);
+
+	if (devs)
+		printk(KERN_INFO "PnP: %i device%s detected total\n", devs, devs > 1 ? "=
s" : "");
+	else
+		printk(KERN_INFO "PnP: No devices found\n");
 }
=20
=20

--d6Gm4EdcadzBjdND--

--TakKZr9L6Hm6aLOc
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE7VAYYBm4rlNOo3YgRAqE5AJ9ze4kNtsFeJwW4dSkcFymYZcXNHACfU3gR
oC47HLCzhl5jLWVBsyAJi3Y=
=A5fo
-----END PGP SIGNATURE-----

--TakKZr9L6Hm6aLOc--