Commit Graph

91 Commits

Author SHA1 Message Date
hosokawa
b4395a7a1a Added "include" feature to pccard.conf to put the default pccard.conf
entries in /etc/defaults/.
1999-08-17 03:38:51 +00:00
imp
acda06e0a3 o Add "debuglevel" keyword to config file.
o Document debug level keyword
o Implement debug level:
	o For most of the diagnostic messages, change them from #ifdef DEBUG
	  to if (debuglevel > 0).
	o Add a couple more diagnostic messages that weren't present before
	o Fix a couple of excessively long lines.
Reviewed by: hosokawa-san

o Start to implement the stopgap kludge for -current's pccard code by passing
  the length of the i/o range.  If DEV_DESC_HAS_SIZE is defined, we'll set
  the size.  This is done as an ifdef so that I can generate patches
  against the kernel more easily.
o Add preliminary support for tweaking sleep times, but leave it
  disabled until a good range of values can be established.

Didn't fix: logmsg problem noted by Nate.
1999-08-01 18:04:26 +00:00
hosokawa
009be88d81 Set correct "flags" value when pccardd allocates/initializes driver. 1999-07-23 14:58:33 +00:00
hosokawa
74f62b341b Removed a very very old hack (I disabled it in PAO long time ago)
that existed in original PC-card driver for FreeBSD 2.0 (maybe).
This prevents from utilizing flags for drivers.
1999-07-23 08:53:20 +00:00
hosokawa
ad8014e762 Sorry, I forgot to test "iosize auto" before merging "iosize" patch. 1999-07-23 02:01:19 +00:00
hosokawa
104085db69 Inappropriate commment for -i option. 1999-07-23 01:46:47 +00:00
hosokawa
7fdfe857ae Added "iosize" directive in /etc/pccard.conf
Allocate free I/O window with given size to card.

(example)
# IBM PCMCIA Ethernet I/II
card "IBM Corp." "Ethernet"
	config	0x1 "ed0" ?
	iosize	32
	ether	0xff0

(it's currently only useful for externalizing hacks for broken CIS cards,
 but it will play an important role with "function" directive I'm planninng
 to merge)

Reviewed by:	freebsd-mobile list
Obtained from:	PAO3's "cardio" directive
1999-07-23 01:33:34 +00:00
hosokawa
7592caf7fb Release IRQ allocated dynamically. 1999-07-23 00:12:22 +00:00
imp
6494839c7f Fix a dangling else warning from new egcs. 1999-07-15 03:04:31 +00:00
nik
7effc709bc Add $Id$, to make it simpler for members of the translation teams to
track.

The Id line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

     .\"    $Id$
     .\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by:            bde
1999-07-12 20:12:29 +00:00
hosokawa
7c1d908dc1 pccard_beep parameter is not supported by rc.conf and rc.pccard of -current.
(I'll port it later...)
1999-06-30 04:16:08 +00:00
hosokawa
dd004b8d1a Added -z and -i option. 1999-06-30 03:49:30 +00:00
hosokawa
fe1b840778 FreeBSD does supports LKM now.
PR: doc/10331
Reviewed by: mpp@freebsd.org
Submitted by: Andreas Gustafsson <gson@araneus.fi>
1999-06-29 23:59:15 +00:00
mpp
63d6f378d1 Minor mdoc fix. 1999-06-26 23:16:40 +00:00
markm
2089153f16 More uncontroversial PAO updates. Make the IRQ wildcarding work a lot better,
and improve the daemonizing code.

Submitted by: Tatsumi HOSOKAWA
1999-06-17 21:07:59 +00:00
kuriyama
e2909a3bc9 Fix typo.
Submitted by:	Hiroki Sato <hrs@geocities.co.jp>
1999-05-10 22:01:38 +00:00
kuriyama
47ce47ffa0 Activate pccardc.8. 1999-05-03 11:20:15 +00:00
kuriyama
d9162f6a23 New translation of pccardc.8.
Obtained from:	PAO (written in Japanese)
Reviewed by:	bsd-nomads@clave.gr.jp
		freebsd-mobile@freebsd.org
		Randy Bush <randy@psg.com>
		Bill Trost <trost@grey.cloud.rain.com>
		Bruce Campbell <bc@apnic.net>
1999-05-02 16:33:13 +00:00
imp
352fa6578e When printing out V1 info, make sure that there is additional info
before printing it.  Terminate when we come to a 0xff byte.  This
allows there to be zero or more additional info fields printed
correctly.  Before, the old code would print bogons or dump core when
presented with this case.

I don't know what the spec says about this, exactly, but this allows
me to do a dumpcis of my non-ATA AMP 4M FLASH cards w/o pccardc
dumping core.
1999-03-13 04:41:35 +00:00
kuriyama
309c101287 Cleanup usage of err() and warn().
Add error handling for ioctl().

Reviewed by:	-current
Obtained from:	PAO
1999-02-27 12:08:02 +00:00
kuriyama
bfe98fb56d Add "beep" subcommand.
Obtained from:	PAO3
Reviewed by:	-current list
1999-02-13 11:32:01 +00:00
kuriyama
46c7707481 Use O_RDONLY and O_RDWR for open() instead of number.
Encouraged by:	Nate
1999-02-05 16:00:17 +00:00
kuriyama
6bd1627515 s/card.conf/pccard.conf/ 1999-02-05 15:59:57 +00:00
guido
43498d2a0f When resuming with 2 identical cards in 2 slots, the initialisation
of the second card fails. This fixes that.
1999-01-10 13:00:09 +00:00
kuriyama
2865719e20 Fix typo. 1998-12-10 22:07:06 +00:00
hosokawa
91b26ae13a Keywords "iosize" and "memsize" are unused since 1.5. Removed. 1998-04-25 18:10:10 +00:00
hosokawa
0dfe9be10d #define'd KWD_XXX for keywords. 1998-04-25 17:52:15 +00:00
nate
da9895be7b - Argh, fix stupid logic error in the laststate/state fix previously. That's
what I get for trying to do too many things at once.
1998-04-20 16:24:03 +00:00
nate
c1dd923da9 - Don't try and keep track of the previous state, since the kernel may
change it w/out informing the program.  Instead, use the (now available)
  previous state returned by the kernel to make intelligent card
  removal/insertion decisions.
1998-04-20 15:24:28 +00:00
nate
a4fcc055c0 MF22: Finish fixing 'looping' bug. 1998-04-20 05:42:26 +00:00
nate
2325a18eff - If we see a tuple we don't expect, don't spin forever. Withouth this fix,
I can't run pccardc dumpcis on my Wavelan card. :(

Obtained from:	PAO
1998-04-19 18:41:45 +00:00
charnier
c94dce23b1 .Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq. 1998-03-23 08:31:20 +00:00
hosokawa
d265354dfd Some parameter was left uninitialized when the card with incomplete
"Version 1" CIS tupple is plugged after normal card.
1998-03-20 04:49:19 +00:00
hosokawa
e96492ea8c Reviewed by: mike@smith.net.au
Submitted by:	nate@mt.sri.com
Removed global variables. (and style(9) fix.)
1998-03-09 05:18:59 +00:00
guido
d9277225b0 bit_nset was not correctly used. 1998-03-02 20:51:06 +00:00
guido
533f250818 Fix use of bit_nclear. Amazing that we didn't get more complaints
about inserting 2 pcmcia cards.
1998-03-02 19:00:01 +00:00
hosokawa
385fa6eb66 Removed a confusing "#if 0 ... #endif". 1998-02-27 09:47:36 +00:00
hosokawa
4587e8cc8c Removed "#define EXTERN" because this file doesn't have main(). 1998-02-27 08:40:53 +00:00
hosokawa
d4c33dacab Moved main() to a new file (pccardd.c). 1998-02-27 08:19:25 +00:00
hosokawa
b9d435ef0f Removed unused #include and unneccesary comments. 1998-02-27 08:00:18 +00:00
hosokawa
3e02231338 "pccardc dumpcis" does not need write permission of /dev/card?. 1998-02-27 07:27:27 +00:00
nate
bd6318bbc8 - <pccard/card.h> doesn't exist in -current, so use the include file
<pccard/cardinfo.h>.  I don't know if this will compile, but at least
  it's using an include file that exists.

Forgotten by:	hosokawa
1998-02-27 05:12:48 +00:00
hosokawa
00a2ade9b9 added "rdattr" (read attribute memory) function. 1998-02-26 14:36:01 +00:00
guido
435971b91a This seems to fix my problem that after resume/suspend, sometimes
pccard claims that the driver is already allocated.
It works around a race when pccardd gets woken up too late after a resume.

This is a 2.2.6 candidate.
Reviewed by:	nate@freebsd.org
1998-02-04 20:19:39 +00:00
hoek
b298ef3a0e Use consistent spelling,
writeable -> writable (recall prior debate over this? :-)
	initialise -> initialize
	recognise -> recognize

Merry Christmas! :)
1997-12-25 09:36:42 +00:00
nate
9cdce0445e - Changed strcmp to strncmp for checking the CIS manufacturer strings,
since we only store CIS_MAXSTR data, and the users may stick the
  'entire' CIS string returned from the card in /etc/pccard.conf and
  cause the comparison to (bogusly) fail.

Submitted by:	Brad Karp <karp@eecs.harvard.edu>
1997-12-08 06:35:07 +00:00
nate
455b12038b - Don't worry about the previous state of the card (insert/removed), and
instead Do The Right Thing when the kernel states a card was
  inserted/removed.  This isn't a complete fix, but better than nothing.

Reviewed by:	Guido van Rooij <guido@gvr.org>
1997-11-25 19:15:59 +00:00
nate
2b9425f8b4 - Renamed log_1s() to logmsg(). 1997-11-19 02:31:41 +00:00
nate
f0042aae0b - Include <pccard/cardinfo.h> instead of <pccard/card.h> which was recently
renamed.
1997-11-18 21:08:14 +00:00
nate
550325175d - Disable cards when doing a suspend by emulating that they have been
removed.  Add a new state 'suspend' so we 'fake' insertion events at
  resume time for the cards that have been suspended.

[
The code still works if you remove the card during suspend, switch the
card during suspend, or combinations of both.
]

Reviewed by:	frf@xocolatl.com
1997-10-28 17:51:25 +00:00