Commit Graph

73 Commits

Author SHA1 Message Date
Warner Losh
f229c04eef 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
Jun Kuriyama
7164b74e64 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
Jun Kuriyama
f1165987f1 Add "beep" subcommand.
Obtained from:	PAO3
Reviewed by:	-current list
1999-02-13 11:32:01 +00:00
Jun Kuriyama
3e8f7cf5f9 Use O_RDONLY and O_RDWR for open() instead of number.
Encouraged by:	Nate
1999-02-05 16:00:17 +00:00
Jun Kuriyama
8877f51e9e s/card.conf/pccard.conf/ 1999-02-05 15:59:57 +00:00
Guido van Rooij
67c431ff57 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
Jun Kuriyama
f8a882d809 Fix typo. 1998-12-10 22:07:06 +00:00
Tatsumi Hosokawa
9b473222be Keywords "iosize" and "memsize" are unused since 1.5. Removed. 1998-04-25 18:10:10 +00:00
Tatsumi Hosokawa
af5311ffe2 #define'd KWD_XXX for keywords. 1998-04-25 17:52:15 +00:00
Nate Williams
d0c0b545a7 - 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 Williams
2d4c8d9d6c - 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 Williams
8ff8eb13f7 MF22: Finish fixing 'looping' bug. 1998-04-20 05:42:26 +00:00
Nate Williams
c4bf475b75 - 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
Philippe Charnier
f12a14713b .Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq. 1998-03-23 08:31:20 +00:00
Tatsumi Hosokawa
7d0ec55f03 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
Tatsumi Hosokawa
bc01c37da5 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 van Rooij
2dbace9154 bit_nset was not correctly used. 1998-03-02 20:51:06 +00:00
Guido van Rooij
8393eb700a 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
Tatsumi Hosokawa
cf76d25ad9 Removed a confusing "#if 0 ... #endif". 1998-02-27 09:47:36 +00:00
Tatsumi Hosokawa
07131beb35 Removed "#define EXTERN" because this file doesn't have main(). 1998-02-27 08:40:53 +00:00
Tatsumi Hosokawa
1b39ab6931 Moved main() to a new file (pccardd.c). 1998-02-27 08:19:25 +00:00
Tatsumi Hosokawa
d50ea5b440 Removed unused #include and unneccesary comments. 1998-02-27 08:00:18 +00:00
Tatsumi Hosokawa
26e41202ec "pccardc dumpcis" does not need write permission of /dev/card?. 1998-02-27 07:27:27 +00:00
Nate Williams
f8a88fe654 - <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
Tatsumi Hosokawa
88aa4bcb73 added "rdattr" (read attribute memory) function. 1998-02-26 14:36:01 +00:00
Guido van Rooij
3d08e8c2cc 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
Tim Vanderhoek
dfb9495b2a 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 Williams
50b5ec4154 - 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 Williams
4d1fabf000 - 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 Williams
ae8d0ca416 - Renamed log_1s() to logmsg(). 1997-11-19 02:31:41 +00:00
Nate Williams
ec3383fb48 - Include <pccard/cardinfo.h> instead of <pccard/card.h> which was recently
renamed.
1997-11-18 21:08:14 +00:00
Nate Williams
ec510cabb0 - 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 Williams
e7e437dbfa - 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
Philippe Charnier
9dd6fd23cd Use err(3). Add usage()s. 1997-10-06 11:36:08 +00:00
Nate Williams
a12f9b749f - 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 Williams
b93ad2ea7c 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 Wemm
476602a9d0 Revert $FreeBSD$ to $Id$ 1997-02-22 16:15:28 +00:00
Joerg Wunsch
c64075d5dd Fix some xrefs.
Submitted by:	John-Mark Gurney <jmg@nike.efn.org>
1997-02-09 20:39:00 +00:00
Jordan K. Hubbard
1130b656e5 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 Williams
9c45d91e00 Fix typo I introduced in the DEBUG code last night. 1997-01-06 17:12:00 +00:00
Nate Williams
16a960917f - 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 Williams
dc9d5eda2a 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
Wolfram Schneider
e0e5145ce6 add missing comma(s) in .Xr macros 1996-09-23 22:24:39 +00:00
Bruce Evans
680b396b51 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 Williams
a076b72573 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 Williams
fd87c5bd16 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 Williams
a866b5490e Don't un-necessarily include varargs.h. 1996-06-20 21:06:53 +00:00
Nate Williams
f9651e7e52 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 Williams
f7ea09fc34 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 Williams
29f0bf5478 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