Commit Graph

191 Commits

Author SHA1 Message Date
maxim
f1fb990079 o Document -s flag.
No objections from:	ume
MFC after:		2 weeks
2004-01-15 13:23:21 +00:00
maxim
2341044956 o Actually add -x option: probeonly assigment was missed
in rev. 1.15 pccardd.c.

Reported by:            osa
OK'ed by:               imp
MFC after:              2 weeks
2003-12-26 10:01:29 +00:00
imp
a59ed65152 Ooops. Committed sin number 1: updating the code w/o updating the comments.
Update the comments too.
2003-10-04 18:43:21 +00:00
imp
786346d191 I've been burned about half a dozen times by the old PAO syntax for
'any' interrupt.  There's no reason not to be liberal here and accept
the PAO syntax.

MFC After: 2 weeks
2003-10-04 18:40:36 +00:00
imp
991dd8e163 Go ahead and allow ports as high as 0xfff to be used for pccard
devices.  Only some devices support above 0x400, but since you have to
explicitly enable this range, you are assumed to know what you are
doing.
2003-08-03 06:17:06 +00:00
dds
82b3d240e1 Report the I/O base address in hex to be consistent with its
specification format.

Approved by:	schweikh (mentor)
MFC after:	2 weeks
2003-07-18 21:53:42 +00:00
imp
8c54690ffe Include string.h for strlen declaration 2003-06-09 06:17:07 +00:00
imp
606a9095e3 Include stdlib.h for exit declaration 2003-06-09 06:16:18 +00:00
imp
68aa30aea2 Include string.h for strcmp declaration 2003-06-09 06:16:00 +00:00
imp
e2a59d9b09 Remove obsolete compatibility ifdef. 2003-04-23 23:41:48 +00:00
imp
847a005af4 Copy CIS3 and CIS4 strings into the kernel too.
PR:		51333
Submitted by:	Scott Mitchell
2003-04-23 23:40:28 +00:00
obrien
a920d12f89 style.Makefile(5) 2003-04-04 17:49:21 +00:00
imp
e4f4ea4bee manufacturer id is typically 4 bytes 2003-03-14 21:11:01 +00:00
imp
dd59bce609 Don't be so verbose about 'unknown' CIS tuples. We were printing each
one three times before we did the dump.  Also, we printed 0x00 for the
tuple type rather than the actual tuple type.  Now, we print the
actual tuple type.  This appears to have no ill effects.

Should get rid of the

Code NN not found
and
code Unknown ignored

messages.  The ignored messages are still generated for tuples tuples
who have a minimum length set and we find a tuple of that type that's
shorter than the minimum length.
2003-03-14 13:17:35 +00:00
ru
ea25d256ea mdoc(7) police: Nits. 2003-03-02 21:04:21 +00:00
green
cf6c582982 Add a new subcommand to pccardc(8), "dumpcisfile", which reads a CIS
structure from a file instead of a PC-CARD itself before parsing and
dumping it. (E.g. useful when you get a CIS file from a manufacturer
which fixes they broken card's CIS, and add it to the pccard quirks.)
2003-02-25 22:14:38 +00:00
schweikh
86f7487fb6 Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.
2002-12-30 21:18:15 +00:00
ru
041d1287e8 Uniformly refer to a file system as "file system".
Approved by:	re
2002-12-12 17:26:04 +00:00
imp
fb1ad82fcf Remove bogus comments about why we do some silly things, and instead
just say that the reasons are historical.

Pr: 41104
Submitted by: hiten
2002-09-29 23:56:33 +00:00
imp
fd3bf3a364 Add -x option. This causes pccardd to exit after probing the cards. This
is useful for low memory systems.

PR: 36418
Submitted by: Forrest W. Christian
2002-09-29 23:00:11 +00:00
imp
b03c6fa493 Add a ; to make a non-null statement 2002-09-29 22:58:53 +00:00
imp
a76817b741 Copy cis strings into the kernel. 2002-07-22 06:58:24 +00:00
charnier
d2168fe021 The .Nm utility 2002-07-14 14:47:15 +00:00
des
4d6b787d2d Usage style sweep: spell "usage" with a small 'u'.
Also change one case of blatant __progname abuse (several more remain)
This commit does not touch anything in src/{contrib,crypto,gnu}/.
2002-04-22 13:44:47 +00:00
dd
e70f6b318d Correct a typo.
PR:		36214
Submitted by:	Nagy Attila <bra@fsn.hu>
2002-03-24 02:34:59 +00:00
shiba
20a87ba61a Add some code which read manufucturer id. This is for NEWCARD compatibility.
Reviewed by: imp
2002-02-20 14:48:23 +00:00
imp
4e1080d4dc Update length more correctly when parsing a cis info field.
Before, we were using
	while (*p++ && --len > 0);
to do this.  However, len doesn't get decremented for the NUL byte, so when
we used len later to see if we still have CIS left for some optional fields,
we'd run off the end of an array and dump core.

Instead, replace it with
	len -= strlen(p) + 1;
	p += strlen(p) + 1;
which is more correct.  It is a little bogus to assume that p points to
a valid C string, but only a little.  The PC Card SPEC mandates that it
does, and we already depend on that with the use of strdup a few lines
earlier.  Since much of the rest of the cis parsing code isn't hyper
retentive about error checking, I'll leave that level of checking for
another time and/or another committer :-).
2002-01-06 18:03:55 +00:00
iwasaki
844abb905a Fix a bug about CIS string comparison. Pccardd should be able to distinguish
card "MELCO" "LPC2-T"
and
	card "MELCO" "LPC2-TX"
by this fix.

Reported by:	Kitagawa Shoichi <sk@xstar.kiu.ac.jp>,
		NINOMIYA Hideyuki <nin@shikoku.ne.jp>
MFC after:	1 week
2001-11-29 14:33:57 +00:00
imp
bf4b2ea40e Always set unit number to -1 unless some other unit is specified in
the config file.  This fixes the breakage caused by the recent change
in the behavior of device_add_child for ata (which shows soren's
reservations were well founded).

Submitted by:	OGAWA Takaya <t-ogawa@triaez.kaisei.org>
2001-11-02 17:28:43 +00:00
imp
d3e4b82b69 Don't core dump if we can't get the index automatically.
Debug info from:	Ben Hockenhull <benh@jpj.net>
2001-10-05 20:38:32 +00:00
non
e24b3c902b Change the access width of memory window from 8 bits to 16 bits.
16 bits access is required by nsp driver to work in SMIT mode.
Since previously (1.65 and before in current, and 1.46.28 and before
in stable branch) 16 bits access was default, I hope it will break nothing.

Okayed-by: imp
2001-09-04 04:40:09 +00:00
imp
9860c27835 Fix ISA machines. Also, make it possible for the new pccardd to run
on older kernels correctly.  Terminate the loop when we find a
suitable irq.  Also, only try to select from the pool.  Cleaned up the
two cases (IRQ picked by the user and ?) into one.

MFC upon re approval.
2001-08-19 19:16:26 +00:00
imp
566a98cb13 Ask the kernel about IRQ 0 first. If the kernel responds with an IRQ,
use it.  If not, then loop asking for each one, with normal -I
processing.  This will effectively disable -I for when the pcic is in
PCI function interrupt routing mode.
2001-08-14 19:18:33 +00:00
imp
09aa99ee9b Only try to allocated properly aligned I/O segments. This should stop
some of the config problems that we've been seeing (where wi0 tries to
allocate 0x138-0x198, for example).

Use err(1,"foo") rather than perror + exit while I'm here.
2001-08-02 07:06:32 +00:00
imp
88d723fb61 Have pccardd always ask the kernel for the IRQ to use. The kernel
will soon return the irq from the pcic bridge in cases where't that's
appropriate.

Note: I've had to disbale -I option for the moment.  I've made it easy
to reenable it for people that need it.

MFC After: soon!
2001-07-31 06:12:01 +00:00
imp
98c03bcff2 Improve wording for pccard memory assignement.
Document intended correct behavior for pccardc power and how it interacts
with suspend/resume.
2001-07-27 06:32:20 +00:00
obrien
9c97c8f02d Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
2001-07-20 06:20:32 +00:00
obrien
be022bb715 Remove GCC'isms in CFLAGS. 2001-07-20 04:23:13 +00:00
dd
911ca14c87 Remove whitespace at EOL. 2001-07-15 08:06:20 +00:00
ru
0d5f9334cf mdoc(7) police: removed HISTORY info from the .Os call. 2001-07-10 15:12:08 +00:00
dd
eaa6ee03b8 mdoc(7) police: remove extraneous .Pp before and/or after .Sh. 2001-07-09 09:54:33 +00:00
dd
04d1b1c8dd Remove duplicate words. 2001-06-24 01:34:38 +00:00
imp
69da75afd3 Resetting using COR bit 7 appears to be bad on pci based systems.
#ifdef it out for now.
2001-06-04 07:41:05 +00:00
imp
d762ae3867 Add suggested parens around truth value. 2001-05-31 04:37:17 +00:00
imp
189d400eed From the PR:
The PCCard daemon can hang indefinately while reading its
	configuration file. If the last line of the file is a comment line
	that does not end in a newline, the program goes into an infinite
	loop searching for the non-existent newline.

This fix, provided by the PR, will allow files ending without a newline
to be read without hanging.

Submitted by: Crist J. Clark <cjclark@alum.mit.edu>
PR: bin/25791
2001-05-30 21:45:50 +00:00
dmlb
5a262f2f9a Use constants in <pccard/cis.h> for scannign the memory window with.
Approved by:	imp
2001-05-07 21:58:31 +00:00
dmlb
06904b781a Ensure that pccardd sets up memory windows correctly for drivers other
than if_ed. The code for if_ed to set the offset and memory width
remains.

Approved by:	imp
2001-05-07 21:56:57 +00:00
dmlb
386e9afad3 Fix a minor printing bug that prints incorrect information for memory
block sizes.

This orginally worked in PAO-3 and worked on their r330 branch but got
broken in PAO-3 around December 1998!

Approved by:	imp
Obtained from:	PAO-3
2001-05-07 21:51:54 +00:00
ru
162a118d7d Backout revision 1.6 (removed the NOSHARED bit.)
These must be compiled static so that it is possible
to use them early in the boot process.

Requested by:	imp
2001-04-02 08:47:25 +00:00
ru
dc9de76619 Removed the NOSHARED bit. 2001-04-02 07:27:46 +00:00