Initial revision
[openwrt/svn-archive/archive.git] / obsolete-buildroot / sources / pcmcia.patch
1 --- pcmcia-cs-3.1.34/etc/config.opts.orig Tue Jul 9 09:36:23 2002
2 +++ pcmcia-cs-3.1.34/etc/config.opts Tue Jul 9 09:37:47 2002
3 @@ -5,7 +5,7 @@
4
5 # System resources available for PCMCIA devices
6
7 -include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff
8 +include port 0x100-0x4ff, port 0xc00-0xcff
9 include memory 0xc0000-0xfffff
10 include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff
11
12 diff -urN pcmcia-cs-3.2.3.orig/etc/shared pcmcia-cs-3.2.3/etc/shared
13 --- pcmcia-cs-3.2.3.orig/etc/shared 2002-08-18 21:21:11.000000000 -0600
14 +++ pcmcia-cs-3.2.3/etc/shared 2003-02-14 05:05:07.000000000 -0700
15 @@ -2,6 +2,8 @@
16 # shared 1.31 2002/08/19 03:21:11 (David Hinds)
17 #
18
19 +umask 022
20 +
21 usage ()
22 {
23 echo "usage: $0 [action] [device name]"
24 --- /dev/null 2003-01-21 22:14:35.000000000 -0700
25 +++ pcmcia-cs-3.2.4/etc/pcmcia 2003-06-09 12:04:02.000000000 -0600
26 @@ -0,0 +1,6 @@
27 +# Defaults for pcmcia (sourced by /etc/init.d/S30pcmcia)
28 +PCMCIA=yes
29 +PCIC=yenta_socket
30 +PCIC_OPTS=
31 +CORE_OPTS=
32 +CARDMGR_OPTS=
33 --- pcmcia-cs-3.2.4/etc/rc.pcmcia.orig 2002-08-08 00:43:43.000000000 -0600
34 +++ pcmcia-cs-3.2.4/etc/rc.pcmcia 2003-06-09 15:17:28.000000000 -0600
35 @@ -4,6 +4,8 @@
36 #
37 # This is designed to work in BSD as well as SysV init setups. See
38 # the HOWTO for customization instructions.
39 +# Modified to comply with Debian's standards by Brian Mays
40 +# <brian@debian.org>.
41
42 # Tags for Red Hat init configuration tools
43 #
44 @@ -26,9 +28,9 @@
45 done
46
47 # Source PCMCIA configuration, if available
48 -if [ -f /etc/pcmcia.conf ] ; then
49 +if [ -f /etc/default/pcmcia ] ; then
50 # Debian startup option file
51 - . /etc/pcmcia.conf
52 + . /etc/default/pcmcia
53 elif [ -f /etc/sysconfig/pcmcia ] ; then
54 # Red Hat startup option file
55 . /etc/sysconfig/pcmcia
56 @@ -50,9 +52,22 @@
57 done
58 if [ "$PCMCIA" -a "$PCMCIA" != "yes" ] ; then exit 0 ; fi
59
60 +# Debian modification: Fix PCIC for stand-alone modules.
61 +# yenta_socket -> i82365 on these systems.
62 +# Existence of a standalone module implies that it is preferred.
63 +if [ -d /lib/modules/preferred ] ; then
64 + PC=/lib/modules/preferred/pcmcia
65 +else
66 + PC=/lib/modules/`uname -r`/pcmcia
67 +fi
68 +if [ "$PCIC" = yenta_socket -a -e $PC/i82365.o \
69 + -a ! -L $PC/i82365.o ]; then
70 + PCIC=i82365
71 +fi
72 +
73 usage()
74 {
75 - echo "Usage: $0 {start|stop|status|restart|reload}"
76 + echo "Usage: $0 {start|stop|status|restart|reload|force-reload}"
77 }
78
79 cleanup()
80 @@ -84,7 +99,7 @@
81 SC=/var/lib/pcmcia/scheme
82 RUN=/var/lib/pcmcia
83 else
84 - SC=/var/run/pcmcia-scheme
85 + SC=/var/lib/misc/pcmcia-scheme
86 RUN=/var/run
87 fi
88 if [ -L $SC -o ! -O $SC ] ; then rm -f $SC ; fi
89 @@ -154,7 +172,7 @@
90 ;;
91
92 status)
93 - pid=`/sbin/pidof cardmgr`
94 + pid=`/bin/pidof cardmgr`
95 if [ "$pid" != "" ] ; then
96 echo "cardmgr (pid $pid) is running..."
97 EXITCODE=0
98 @@ -164,12 +182,18 @@
99 fi
100 ;;
101
102 - restart|reload)
103 + restart)
104 $0 stop
105 $0 start
106 EXITCODE=$?
107 ;;
108
109 + reload|force-reload)
110 + echo "Reloading $DESC configuration files."
111 + kill -1 `cat /var/run/cardmgr.pid` 2>/dev/null
112 + EXITCODE=0
113 + ;;
114 +
115 *)
116 usage
117 ;;
118 @@ -179,4 +203,4 @@
119 done
120
121 # Only exit if we're in our own subshell
122 -case $0 in *rc.pcmcia) exit $EXITCODE ;; esac
123 +case $0 in *pcmcia) exit $EXITCODE ;; esac