Commit Graph

59 Commits

Author SHA1 Message Date
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
nate
cbe958ff02 - Do a bunch of gratuitous changes intended to make the code easier to
follow.
 * Rename/reorder all of the pccard structures, change many of the member
   names to be descriptive, and follow more closely other 'bus' drivers
   naming schemes.
 * Rename a bunch of parameter and local variable names to be more
   consistant in the code.
 * Renamed the PCCARD 'crd' device to be the 'card' device
 * KNF and make the code consistant where it was obvious.
 * ifdef'd out some unused code
1997-10-26 04:36:24 +00:00
charnier
3e78ea9501 Use err(3). Add usage()s. 1997-10-06 11:36:08 +00:00
nate
eb9cb81f95 - Bump up the size of the space for strings read from PCMCIA cards. Newer
cards have longer entries.

Submitted by:	Lars Fredriksen <lars@fredriks-1.pr.mcs.net>
1997-09-23 19:51:32 +00:00
nate
7a3ed41c1e The pccard daemon doesn't support the 'class' parameter as stated in the
documentation, so remove any hints of it.

Submitted by:	"Brent J. Nordquist" <bjn@visi.com>
1997-02-26 15:55:10 +00:00
peter
32d6b795de Revert $FreeBSD$ to $Id$ 1997-02-22 16:15:28 +00:00
joerg
81a37e3d87 Fix some xrefs.
Submitted by:	John-Mark Gurney <jmg@nike.efn.org>
1997-02-09 20:39:00 +00:00
jkh
9c0cd3f9df Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
nate
38ecbe4fe9 Fix typo I introduced in the DEBUG code last night. 1997-01-06 17:12:00 +00:00
nate
5a6259c4d5 - A pass at staticizing things.
- Try to have all output go through the routines in util.c [logerr(),
  log_1s(), die()]
- Add *some* code in util.c to allow pccardd to run out of sysinstall.

Submitted by: Mostly me, but some by Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
1997-01-06 08:35:06 +00:00
nate
cb9e42f13d Alphabetize the sources in the Makefile (this will help us to sync with
the Nomad sources in the future).
1997-01-06 08:11:23 +00:00
wosch
e7eeae0eba add missing comma(s) in .Xr macros 1996-09-23 22:24:39 +00:00
bde
3c2ee02d21 Removed unused `-I.'s from CFLAGS.
"." means the object directory, so it is just confusing to use it
when nothing is included from the object directory unless the object
directory is also the source directory.  It is confusing for "."
not to mean the source directory anyway, so used `-I.'s should be
replaced by `-I${.OBJDIR}'.
1996-09-04 22:25:35 +00:00
nate
ba13991565 Use the defines and macros defined in /sys/pccard/cis.h to make the code
easier to understand.  LOTS more work needed in this area.

Inspired by:	The Nomad code
1996-08-01 15:45:46 +00:00
nate
a9c1f9b750 In num_tok, allow the user to specify '0' as plain '0' instead of
forcing them to use '00', and/or '0x0'.

Submitted by:	Johann Tonsing <jtonsing@mikom.csir.co.za>
1996-07-11 15:04:43 +00:00
nate
fd35bf0230 Don't un-necessarily include varargs.h. 1996-06-20 21:06:53 +00:00
nate
f4d7338241 Print out the IRQ rather than the IRQ mask when printing out the
resources allocated to the driver when DEBUG is defined.
1996-06-19 17:27:55 +00:00
nate
bc2de85961 Enable code that allows the daemon to select a free IRQ from the list if
none is selected.  The code was already there but needed to be updated
to use the correct structure element.
1996-06-19 01:25:37 +00:00
nate
cfb88cf3f2 Use irq_tok() instead of num_tok() for IRQ's. This will allow us to use
the '?' (undefined) token for stating IRQ's in the driver config line.

This will allow the card to automatically select and unused IRQ when
that code is enabled.
1996-06-19 01:08:58 +00:00
nate
fd56b008fc Staticize and removed unused code. 1996-06-18 23:50:51 +00:00
nate
25b1566176 Use CFLAGS += instead of setting it directly. 1996-06-18 22:54:25 +00:00
nate
2fe26d2b79 Staticize and remove unused function.
Inspired by:	The Nomad code
1996-06-18 21:58:55 +00:00
nate
4e5589c7ea - Removed dead code (if you need it you can get it out of the
Repository).
- Added some comments, and moved some code around to make flow more
  obvious.

No functional changes.
1996-06-18 19:52:30 +00:00
nate
217f9f99c0 Prepend the CIS string length define with CIS_ per the rest of the
constants.

Obtained from:	Nomad code
1996-06-17 22:30:30 +00:00
nate
853f1acab3 Use the defined path to the card devices instead of hard-coding it's
value in every file.

No functional changes.
1996-06-17 22:14:19 +00:00
phk
7565af19fa Add BINDIR 1996-06-05 04:39:34 +00:00
nate
96b360c02f - Make pccardd release it's allocated io space and sets the mem.cardaddr
even if DEBUG is not set.
- #ifdef protect DEBUG printf's

Submitted by:	sos
1996-04-23 16:46:48 +00:00
nate
223e65965d Fix usage: message to print out corrrectly.
Submitted by:	Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>
1996-04-18 05:23:47 +00:00
nate
2bc85bbf31 Added RCS Id and BSD-style copyrights to individual files. 1996-04-18 04:25:17 +00:00
nate
7f78c5620d Run indent on all these files to make them more readable. (I also went
through by hand and cleaned up some indent bogons.)
1996-04-10 06:49:32 +00:00
nate
b56f778ea4 Run indent on all these files to make them more readable. (I also went
through by hand and cleaned up some indent bogons.)
1996-04-10 05:45:39 +00:00
nate
1703e79644 Remove a file no longer valid as the config file moved to /etc/pccard.conf. 1996-04-09 23:33:08 +00:00
nate
7fbbbc47cb Cleanup useless stuff in Makefile and add a missing NOMAN target. 1996-04-09 23:31:51 +00:00