app-laptop/smcinit removal, due to conflicting files with net-wireless/irda-utils which incidentally provides a more up-to-date implementation of the same functionality. See bug #194859 for reference.

3 files changed, 0 insertions, 138 deletions

diff --git a/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch b/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch
deleted file mode 100644
index 52d6086d4d3f..000000000000
--- a/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -uprN smcinit-0.4-1/smcinit.c smcinit-0.4-1-r1/smcinit.c
---- smcinit-0.4-1/smcinit.c	2004-04-20 21:56:41.000000000 +0200
-+++ smcinit-0.4-1-r1/smcinit.c	2006-01-01 18:37:40.000000000 +0100
-@@ -173,7 +173,7 @@ int set_smc(int sir_io, int fir_io, int 
-     /* setpci.c */ 
-     struct pci_access *acc;
-     struct pci_dev *dev;
--    word twobyte;
-+    u16 twobyte;
-     int i = 0;
-     int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma;
- 
-@@ -188,7 +188,7 @@ int set_smc(int sir_io, int fir_io, int 
- 	}
-     acc = pci_alloc();
-     pci_init(acc);
--    dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC); /* 5100 also dev 1f */
-+    dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC); /* 5100 also dev 1f */
-     twobyte = pci_read_word(dev, VID);
-     if (twobyte != 0x8086) {
- 	fprintf(stderr, "%s IO hub vendor %x not intel (0x8086)\n", PROGNAME, twobyte);
-diff -uprN smcinit-0.4-1/tosh1800-smcinit.c smcinit-0.4-1-r1/tosh1800-smcinit.c
---- smcinit-0.4-1/tosh1800-smcinit.c	2004-04-20 21:56:41.000000000 +0200
-+++ smcinit-0.4-1-r1/tosh1800-smcinit.c	2006-01-01 18:37:40.000000000 +0100
-@@ -75,8 +75,8 @@ static int _debug = 0;
-  */
- struct port_decoding_access_info {
-     int port;
--    byte reg;
--    byte or_mask;
-+    u8 reg;
-+    u8 or_mask;
- };
- 
- struct port_decoding_access_info ali1533_ports[] = {
-@@ -122,7 +122,7 @@ configure_47N227_smc_ircc(int revision, 
- 
- struct smc_chip_model {
-     char *name;
--    byte version_id;
-+    u8 version_id;
-     int (*config_function) (int revision, int cfgbase, int sirbase,
-                             int firbase, int dma, int irq);
- };
-@@ -279,7 +279,7 @@ static int find_ali1533_port_access_info
- static int print_ali1533_port_status(struct pci_dev *dev)
- {
-     struct port_decoding_access_info *p;
--    byte onebyte;
-+    u8 onebyte;
-     int i;
- 
-     DEBUG("printing port status");
-@@ -305,7 +305,7 @@ static int print_ali1533_port_status(str
- static int set_ali1533_port(struct pci_dev *dev, int port, int decode)
- {
-     struct port_decoding_access_info info;
--    byte previousval, onebyte, and_mask;
-+    u8 previousval, onebyte, and_mask;
-     int retval;
- 
-     DEBUG_VAL("looking for port", port);
-@@ -427,7 +427,7 @@ static int configure_ali1533_smc_ports_d
- 
- static int configure_47N227_smc_ircc(int revision, int cfgbase, int sirbase, int firbase, int dma, int irq)
- {
--    byte onebyte;
-+    u8 onebyte;
-     int retval;
- 
-     /* claudiuc: revision is not used yet */
-@@ -526,7 +526,7 @@ static struct smc_chip_model *find_smc_c
- static int
- configure_smc_ircc(int cfgbase, int sirbase, int firbase, int dma, int irq)
- {
--    byte version_id, revision_id;
-+    u8 version_id, revision_id;
-     struct smc_chip_model *chip_model;
-     int retval;
- 
-diff -uprN smcinit-0.4-1/tosh2450-smcinit.c smcinit-0.4-1-r1/tosh2450-smcinit.c
---- smcinit-0.4-1/tosh2450-smcinit.c	2004-04-20 21:56:41.000000000 +0200
-+++ smcinit-0.4-1-r1/tosh2450-smcinit.c	2006-01-01 18:37:40.000000000 +0100
-@@ -58,12 +58,12 @@ int main()
-   /* setpci.c */
-   struct pci_access *acc;
-   struct pci_dev *dev;
--  word twobyte;
-+  u16 twobyte;
-   
-   acc = pci_alloc();
-   pci_init(acc);
-   
--  dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC);
-+  dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC);
-   
-   twobyte = pci_read_word(dev,VID);
-   if (twobyte != INTEL_VID){ 
diff --git a/app-laptop/smcinit/files/smcinit.conf b/app-laptop/smcinit/files/smcinit.conf
deleted file mode 100644
index 154f2d6d2857..000000000000
--- a/app-laptop/smcinit/files/smcinit.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Which SMC-IRCC initializer should we run?
-#SMCEXE=smcinit
-#SMCEXE=tosh1800-smcinit
-#SMCEXE=tosh2450-smcinit
-
-# What kernel module the initializer should be applied to?
-#SMCMODULE=smsc-ircc2
diff --git a/app-laptop/smcinit/files/smcinit.initscript b/app-laptop/smcinit/files/smcinit.initscript
deleted file mode 100755
index 694a7379cb2c..000000000000
--- a/app-laptop/smcinit/files/smcinit.initscript
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/files/smcinit.initscript,v 1.1 2004/11/24 16:03:03 s4t4n Exp $
-
-depend() {
-	before irda
-}
-
-checkconfig() {
-	if [ -z "$SMCEXE" ] || [ -z "$SMCMODULE" ] ; then
-		eerror "You need to setup SMCEXE and SMCMODULE in /etc/conf.d/smcinit first"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Running ${SMCEXE}"
-	/usr/sbin/${SMCEXE}
-	eend ${?} || return 1
-
-	ebegin "Loading ${SMCMODULE}"
-	modprobe ${SMCMODULE}
-	eend ${?}
-}
-	
-stop() {
-	ebegin "Unloading ${SMCMODULE}"
-	modprobe -r ${SMCMODULE}
-	eend ${?}
-}