Commit Graph

449 Commits

Author SHA1 Message Date
imp
954c37da29 Use %#jx for both args.
Non-use of %# mocked by: bde
2003-11-04 06:30:59 +00:00
imp
ba259e8c51 Fix two small style nits pointed out by bde: Remove spaces after cast and
indent continued line 4 spaces instead of 2.
2003-11-03 21:54:24 +00:00
imp
e4d314404f Sync to 1.79 2003-11-03 16:12:27 +00:00
imp
00da6b89f2 Add intel EtherExpress PRO PCMCIA card ID. Well, I don't know if it
is really EtherExpress or EEPro or what, but it does appear in a
couple of ethernet cards that have appeared recently on ebay.  Silicom
appears to make these cards, and they have the 82595TX chipset in
them, and sometimes uarts.  The ex driver needs some work to support
these cards, but I thought I'd get the device into pccarddevs.
2003-11-03 16:09:17 +00:00
imp
2d0c1ab108 Sync to 1.78 2003-11-03 16:05:46 +00:00
imp
4bbd8335fc o Use %j and uintmax_t rather than uint64_t for casting.
o use more proper bus_size_t for iosize rather than bus_addr_t.

Noticed by: bde
2003-11-03 16:04:31 +00:00
imp
62c0a5f81d ia64 tenderbox hates what I did wrt a printf, so cast the snot out of
it and hope for the best.
2003-11-03 01:30:03 +00:00
imp
1715012e34 MFp4:
o Fix MFC cards.  We were bogusly setting CCR_IOBASE[01] and CCR_IOLIMIT.
  now when we activate the resource, we adjust these for MFC cards, per the
  spec.
o Change type of pf_mfc_* to be bus_addr_t, which is more correct than
  long.

This makes my 3C362D/3C363D and 3CXEM556 cards work!  Woo Hoo!
2003-11-02 20:18:19 +00:00
imp
3543793158 sync to 1.77 2003-10-27 05:37:34 +00:00
imp
3d6f5f0b43 Correct CEM33 2003-10-27 05:37:01 +00:00
imp
926420ae44 Sync to pccarddevs 1.76 2003-10-26 22:24:01 +00:00
imp
9fccc74128 Add Olicom GoCard 28.8k version 2003-10-26 22:22:34 +00:00
imp
5cdfd9a372 Sync to 1.75 of pccarddevs 2003-10-26 20:09:57 +00:00
imp
2ebce6f2f6 Minor tweak to Olicom 2220. Also add the OC-2232 while I'm here.
Looks like 'special magic' is needed to access the ethernet part of
that combo card, so I've not added it to ex.
2003-10-26 20:09:18 +00:00
imp
27777fa56f Sync to pccarddevs 1.74 2003-10-26 06:32:50 +00:00
imp
253d04949e Add ID for olicom GOCARD Ethernet (OC2220) 2003-10-26 06:31:46 +00:00
imp
7a210cb6a4 Const poison string accessor functions. 2003-10-26 00:51:40 +00:00
imp
d16e8d20c6 sync to 1.73 2003-10-08 01:16:07 +00:00
imp
1dcd696163 Xircom Wireless ethernet
Submitted by: Keith Davis
2003-10-08 01:15:41 +00:00
imp
3c9423ed25 Add new file for definitions of CIS. We can share this with cardbus.
the filename isn't that bad, because all of these are defined in the
PC Card standard :-)
2003-10-07 03:35:48 +00:00
imp
a14856a6a8 o move the cis tuple definitions into a common file.
o minor optimization of cardbus_cis processing.  Remove a bunch of generic
  entries that are handled by generic.
o no longer need the card_get_type stuff.
2003-10-07 03:33:54 +00:00
imp
c69588a19e refactor how we do the quirk matching. this puts an ugly if into a
routine of its own, and allows us to move the indentation back two
layers making the code more readable.

delete a prototype that should have been killed years ago in pccardvar.h.

# adding quirks here is way harder than it needs to be. :-(
2003-10-06 07:17:20 +00:00
imp
57b5be873d Remove the cis reading bus methods. They were never implemented and
there's been some critism about the API not being lock friendly.
2003-10-06 07:10:40 +00:00
imp
801b59d24f sync to 1.72 2003-09-22 05:27:33 +00:00
imp
e29006177e Merge from NetBSD:
1.186: onoe; Sony's PEGA-WL110 CF WLAN (which strangely has fujitsu's
   vendor id)
1.185: ichiro; Quatech Inc, PCMCIA Enhanced Parallel Port Card

Also:
o update $NetBSD$
o minor tweaks to FUJITSU.  We've tried to keep the CIS only entries seprate
  from vendor id/product id.
2003-09-22 05:27:03 +00:00
imp
1488a1b591 update to 1.71 2003-09-20 18:01:51 +00:00
imp
988bd8667b EXPsys PCMCIA Ethernet Combo
Submitted by: Ludwig Pummer
2003-09-20 17:54:30 +00:00
imp
ff24bd8ac9 Remove unused #defines. 2003-09-20 17:46:39 +00:00
imp
b47f4b4ae0 sync to 1.70 2003-09-20 05:24:50 +00:00
imp
74012fac9f OEM version of Proxim Harmony card
Submitted by: Jeremy Bingham
2003-09-20 05:23:50 +00:00
imp
e4939ef70d Whacked out CIS configurations can cause us to not have any child. When
such a card is ejected, we'd panic.  Instead, just ignore it.

I should also add a sanity check in the FUNCID code as well, but this
isn't wrong since the check is cheap and happens infrequently.
2003-09-05 03:08:08 +00:00
imp
f208df8a36 Remove unneeded field after CIS changes. 2003-08-29 00:25:50 +00:00
imp
dd084178f0 Probe routines can return < 0 for speculative matches. In the
compatibility routine, go ahead and accept that as 'success'.  A
properly written compatible driver should return < 0 for both the
compat match and compat probe routines, so this will wind up doing the
right thing.
2003-08-25 18:20:03 +00:00
obrien
c63dab466c Use __FBSDID().
Also some minor style cleanups.
2003-08-24 17:55:58 +00:00
imp
7988908976 Sync 2003-08-21 18:05:55 +00:00
imp
cd24abf0c8 Sort the vendors into three sections. First section is for those
vendors that list the vendor ID in the proper byte order.  The second
section is for vendors that get it backwards.  The third is for what
appear to be 'random' ones (although 0xcxxx appears to be coherent
enough that maybe somebody else is assigning those numbers).
2003-08-21 18:05:35 +00:00
imp
54ff07d4ba Sync to 1.68 2003-08-21 17:50:26 +00:00
imp
8a10259068 Compaq's ID is 0x138. However, it looks like they also released
something with the vendor ID of 0x183.  That could be a typo, or it
could be Paralon Technologies.  Add an entry for Paralon, but don't
use it yet.
2003-08-21 17:49:50 +00:00
imp
3847c28e90 Update to pccarddevs 1.67 2003-08-21 17:40:28 +00:00
imp
ff4bad4bdf Vendor ID 0x274 is Bromax Communications, not Linksys. Linksys sells
them as 'Instant Wireless' cards.
2003-08-21 17:39:56 +00:00
imp
840ce2ddc5 Sync to 1.66 2003-08-21 17:26:59 +00:00
imp
c912f42983 Vendor ID 0x0128 is registered to DSP Solutions, Inc. Megahertz sold
these under X-Jack and XJEM1144.  Update to reflect this.
2003-08-21 17:26:44 +00:00
imp
bec58bb460 Sync to 1.65 2003-08-21 16:43:27 +00:00
imp
65f199ba32 Change INTERSIL to INTERSIL2 for the -1 case. Chances are good that
this card has a real ID, but I don't know what it is at this time.
2003-08-21 16:43:10 +00:00
imp
e09187300d Regen for 1.64 2003-08-21 16:41:14 +00:00
imp
64ce51d51e Vendor 0xb is intersil, not Netgear. The MA401RA is just Netgear's
modle number, and I continue to use it as a place holder until I find
out what Intersil's name for it is.
2003-08-21 16:40:20 +00:00
imp
c002aea5f8 pc98pcic isn't the name of the media driver. tcic likely will never
happen (unless someone sends one to me).  Kill bogus module depend
that I commented out over a year ago.
2003-08-20 05:50:56 +00:00
imp
8b251db37c When debugging CIS, only print 10 CISTPL_NULLs. Chances are good they
are all bogus, and the cards that don't decode things quite right
often have hundreds of them.  This will fix starvation of small dmesg
buffers and allow better debugging to happen.  I thought about adding
an override, but there is such a thing as too many knobs. :-)
2003-08-20 05:44:55 +00:00
imp
4c787d57b8 Put a band-aide(tm) on the CIS panic problem. This is a similar fix
to what is in NetBSD.  I have a few cards that tickles this bug, and
this just keeps us from panicing.  It doesn't actually fix the problem
(that will happen once I figure out why some cards hate the address
their CIS is mapped to high memory).
2003-08-18 03:07:09 +00:00
imp
d969d27534 resync to pcarddevs 1.63 2003-08-14 06:27:48 +00:00
imp
9f56546591 add microsoft mn-520 wlan card.
submitted by: Kirk Strauser
2003-08-14 06:26:58 +00:00
imp
234a039868 Sync to 1.62 of pccarddevs 2003-08-07 19:36:06 +00:00
imp
b63433a093 MELCO has a similar product to Buffalo LPC3-CLX: named the same and
has the same product id, but different vendor id.  It also appears
that the MELCO's id should be 0x18a instead of 0x8a01.  Fix this.

Submitted by: Shizuka Kudo-san
2003-08-07 19:33:11 +00:00
imp
484538ee73 Sync to 1.61 of pccarddevs 2003-07-26 17:46:43 +00:00
imp
f703151191 MFNetBSD:
1.183: gmcgarry; Add Sharp PALDIO 611S
1.184: martin; Socket LP 10/100 CF

Obtained from: NetBSD
2003-07-26 17:45:45 +00:00
imp
36743011ca Sync to 1.60 2003-07-19 05:51:10 +00:00
imp
11353b498e Add Linksys compact flash wireless card
Submitted by: Scott Lambert
PR: 53881
2003-07-19 05:49:17 +00:00
imp
f44d1b0f60 sync to 1.59 2003-07-19 05:33:54 +00:00
imp
f47aefd5c8 Add Buffalo LPC3_CLX.
PR: 47786
Submitted by: IHA, genta -san
2003-07-19 05:32:07 +00:00
imp
a486d7666a OpenBSD calls this AIRVAST, so use that instead 2003-07-15 07:22:21 +00:00
imp
3112aebdbe sync to 1.58 2003-07-15 07:22:03 +00:00
imp
c58faeb762 sync to pccarddevs 1.57 2003-07-15 03:30:31 +00:00
imp
8470188ad2 Add Siemens SpeedStream 1021
Obtained From: openbsd (1.105; millert)
2003-07-15 03:27:53 +00:00
simokawa
089b6703f4 Fix if_wi breakage. 2003-07-11 13:50:31 +00:00
imp
b5f500530e sync to pccarddev 1.55 2003-07-11 09:17:07 +00:00
imp
d9bfb90da8 remove stray ASUS 2003-07-11 09:16:40 +00:00
imp
3f4be1b2a2 sync to pccarddev 1.54 2003-07-11 09:15:45 +00:00
imp
84f3cf33f8 Add asus wl100
PR: 49033, 53249
2003-07-11 09:15:21 +00:00
imp
2a66b0dfee Sync to 1.53 2003-06-17 12:29:49 +00:00
imp
24d21a160e Add FREECOM PCCARD-IDE 2003-06-17 12:29:20 +00:00
imp
0938cb66db Add a comment about the MPSAFEness of this pccard_intr handler. Given
how we registered pccard_intr, it is MPSAFE.  However, since we
register the pccard_intr handler with the flags of the ISR we call,
that is the gating factor.  We need do nothing specific here.

Prompted by: seeing pccard_intr in a panic.
2003-06-13 21:30:29 +00:00
imp
437724b8c3 regen for 1.52 2003-06-11 16:53:47 +00:00
imp
27da01d916 Add ARtem ONAIR wi card.
Submitted by: Ben Gras
Forgotten by: imp
2003-06-11 16:53:26 +00:00
imp
2e0b8fedc0 Sync to 1.51 2003-06-03 01:29:58 +00:00
imp
f86e402281 Add another PCMCIA IDE CARD 2003-06-03 01:29:01 +00:00
imp
9998611adc Sync to 1.50 2003-04-27 03:32:09 +00:00
imp
8cefa025c8 Mystery OEM #1: A really no-name prism3 card that wi supports.
Submitted by: mwlucas
2003-04-27 03:31:47 +00:00
imp
59f16028c2 Sync to 1.49 2003-04-27 00:26:19 +00:00
imp
b673154347 Add a generic cdrom. 2003-04-26 22:13:51 +00:00
imp
1848692e44 Add accessor for cis4 string. Neither OLDCARD nor NEWCARD support
this yet, but that will change soon.

Pr: 51333
Submited by: Scott Mitchell
2003-04-23 23:32:53 +00:00
sanpei
7fd7ee13c5 Sync to 1.48 2003-04-18 15:35:52 +00:00
sanpei
2e291e7846 fix corega vendor id(use vendor string and product string)
Submitted by:	imp
2003-04-18 14:52:14 +00:00
imp
e7b6cf5367 Remove bogus line and entry, restore cnet ne2000 add smc 8041 2003-04-10 07:21:11 +00:00
imp
4c8c5547db Sync to 1.46 2003-04-10 06:59:35 +00:00
imp
5eb0dcf6ad MFNetBSD:
1.182; christos
	A cardflash NE2000 from Michael Francini
	1.181; perry
	support Corega PCCL-11 -- from Christopher SEKIYA in PR 20932
	1.180; ichiro
	add product TOSHIBA PA2673U CBIDE2 (IODATA OEM)
	1.179; kanaoka
	Add SMC 8041TX 10/100 Ether PC Card.
2003-04-10 06:58:40 +00:00
imp
1281a2b1fe In [bsd-nomads:16650] shibagaki-san presented an example product id of
0 in a problem that is being discussed.  That means that the test for
product != 0 may cause problems.  Looking at pccarddevs (which i
should have done earlier) we see:

product	BONDWELL B236		0x0000 Game Card Joystick
product CONTEC CNETPC		0x0000 Contec C-NET(PC)C
product IBM MICRODRIVE		0x0000 IBM Microdrive
product RAYTHEON WLAN		0x0000 WLAN Adapter
product SOCKET EA_ETHER		0x0000 Socket Communications EA
product TDK LAK_CD011WL		0x0000 TDK LAK-CD011WL

so use only the vendor field for the end sentinel.
2003-04-10 04:11:15 +00:00
imp
bab509397b 1.37 was committed prematurely: back out until I can commit all parts at the
same time.
2003-04-09 22:10:28 +00:00
imp
7bba953950 1.77 was bogus: there is no logic bug. Back it out and compare the
correct fields instead.
2003-04-09 22:07:02 +00:00
jhb
4f61f946f2 Fix a logic bug in previous commit (use || rather than &&). In order to
terminate the loop only when both the name and vendor are zero, we should
keep looping so long as either one is not zero.
2003-04-09 21:24:23 +00:00
imp
04fd973e42 Make sure that both pp_name and pp_vendor are zero to know we're at the
end of the list now that some valid entries don't have pp_name set.  Also,
don't print a warning if pp->name is NULL and it is a total wildcard.
2003-04-09 15:54:00 +00:00
imp
ec272b22bc Create new _ND versions to allow one to not specify the description be
stored in the table.
2003-04-08 15:28:58 +00:00
imp
5f6f6eb722 MFP4:
o don't access struct resource members directly.
o Set a default device description based on the CIS name.
2003-04-08 07:02:03 +00:00
imp
3a32b339c9 u_int*_t -> uint*_t
-1 -> 0xffffffff
2003-04-08 06:59:20 +00:00
sanpei
9e59a398a5 fix typo 2003-04-04 14:40:01 +00:00
imp
ad18bcce01 pccarddevs_data.h no longer generated 2003-03-28 06:44:57 +00:00
imp
f0fa26212f MFp4:
Don't generate the data file.
Use 0xffffffff rather than -1 for sign safety as these fields are uint32_t.
2003-03-28 06:43:50 +00:00
imp
3b5aac966d Use %jd and a cast to intmax_t instead of a cast to long.
Minor style nit while I'm here.
2003-03-18 02:40:40 +00:00
imp
c6440201e0 Tag longling_addr as maybe using a bad type, I'm not sure. 2003-03-18 02:38:33 +00:00
imp
48cf728094 Regenerate for 1.45 2003-03-18 02:37:25 +00:00
imp
dd2485f035 Add DLINK DWL650H
From NetBSD by way of deichen
2003-03-18 02:36:54 +00:00
imp
cf874b345d Back out M_* changes, per decision of the TRB.
Approved by: trb
2003-02-19 05:47:46 +00:00
shiba
1d81fcf618 Regen. 2003-02-15 13:58:28 +00:00
shiba
afe7a9b3a4 Add YIS YWL-11B. This card has same vendor id and product id
as XI300 Wireless LAN.
2003-02-15 13:57:52 +00:00
shiba
b4ac024b7f Regen. 2003-02-01 04:47:51 +00:00
shiba
a02f58e575 Allied Telesis WR211PCM(wi) and Corega PCC-T(ed) have
same manufacture id and product id. So use CIS info
(PCCARD_CISTPL_VERS_1).

reported by HONDA Yasuhiro <yasu@yasu.org>
2003-02-01 04:47:29 +00:00
alfred
bf8e8a6e8f Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
2003-01-21 08:56:16 +00:00
shiba
f5d96fabf6 Add BUFFALO LPC-CF-CLT(10Base-T Compact Flash Ether Card). 2003-01-18 02:14:23 +00:00
shiba
44d7962871 Regen. 2003-01-18 02:13:10 +00:00
shiba
b589dfc015 Add Accton EN2216. 2003-01-18 01:14:48 +00:00
shiba
9b3c9205b8 Regen. 2003-01-18 01:14:01 +00:00
shiba
0fec640af4 Add Allied Telesis WR211PCM. 2003-01-17 18:41:32 +00:00
shiba
32bd439fce Regen. 2003-01-17 18:40:31 +00:00
shiba
ee410d3d46 Regen. 2003-01-11 13:01:40 +00:00
shiba
a377931795 RATOC REX-R280(10Base-T Ether Card) and REX-9530(SCSI2 Card) have
same product id. So use CIS info(PCCARD_CISTPL_VERS_1).
2003-01-11 13:00:56 +00:00
non
ac74ec61c7 regen to 1.38
Reviewed by:	imp
Approved by:	re
2002-11-28 01:00:40 +00:00
non
7fa61a493d o Add PC-Cards' ID or CIS strings which are supported by ncv, nsp,
or stg driver. They are,

Macnica mPS110, PANASONIC(KME) KXLC004, Qlogic Fast SCSI,
Workbit Ultra Ninja-16, (ID based)

Future Domain SCSI2GO, IBM SCSI PCMCIA card, I-O DATA CBSC16,
Macnica mPS100, Newmedia BASICS-SCSI, RATOC REX-5536, RATOC REX-5536AM,
RATOC REX-5536M, RATOC REX5572, Workbit NinjaSCSI-3
(CIS based)

  Note: We need vendor IDs WORKBIT2 and IODATA3 which is -1, since some
        cards does not have IDs in the CIS and fails to be probed without
	this fake vendor IDs.

o Change the strings of RATOC REX_R280 from REX-R280 to REX-R280/REX-9530.
  This reminds us that REX-R280 and REX-R9530 have same ID (same product).

Reviewed by:	imp
Approved by:	re
Obtained from:	/etc/defaults/pccard.conf,
		List of CIS tupples by Toshihiko ARAI and PAO project:
			http://www.linkclub.or.jp/~clover/cis/
Change suggestion by:	HASEGAWA Tomoki <thasegawa@mta.biglobe.ne.jp>
			for I-O DATA CBSC16 entry
2002-11-28 00:57:47 +00:00
mux
e428fcdb38 Fix printf() format errors.
Reviewed by:	imp
2002-11-14 14:02:32 +00:00
imp
01eae78096 MFp4:
o Use 32-bit unsigned types for things that really are 32-bit quantities,
  not bus_addr_t.  These are not the same as a bus_addr_t, so don't use
  that here.  Harmless on i386, introduced problems on sparc64.

Submitted by: jhb
2002-11-14 05:15:50 +00:00
imp
36d61097ba Remove an impossible condition. pf->dev is always non-null here. 2002-11-14 05:13:52 +00:00
imp
99afd075e5 regen to 1.37 2002-11-14 05:07:20 +00:00
imp
bd7ef5583b Add a third aic-based bustoaster. 2002-11-14 05:06:25 +00:00
imp
fd4399a908 MFp4:
o Always release the resources on device detach.
o Attach resources the same with driver added as we do we do in the insert
  case (maybe this should be a routine).
o signal the wakeup of the thread on resume instead of trying to force an
  interrupt.
o Minor debug hacks.
o use 0xffffffff instead of -1 for uint32_t items.
o Don't complain when we're asked to detach no cards.  This is normal.
o Eliminate the now worthless second parameter to card_detach_card.
o minor style(9)isms

Some of these patches may be from: iwasaki-san, jhb, iadowse
2002-11-02 23:00:28 +00:00
imp
e89d464126 sync to 1.36 of pccarddevs 2002-10-11 07:00:53 +00:00
imp
fb7adefd2d Merge from NetBSD plus diff reduction to netbsd's pcmciadevs 1.177 file:
o NETGEAR2 -> NETGEAR_2
o PLANEX2 -> PLANEX_2
o ACTIONTEC HWC01170 -> ACTIONTEC PRISM
o linksys iwn2 -> iwn3
o Add: Ositech, DLINK_3, BAY emobility, buffalo lpc3_clt, netgear fa410TX.
  dynalink accton EN2216, corega ether II PCC TD, dlink dfe670TXD,
  dynalink l10c

Obtained from: NetBSD
2002-10-11 07:00:30 +00:00
imp
0005d653fc sync to 1.35 of pccarddevs 2002-10-11 05:40:45 +00:00
imp
2eec8fe31f Add a new NewMedia BUSTOASTER that I bought on ebay (sadly w/o scsi dongle).
Add PLANEX GWNS11H submitted by hanai-san.
2002-10-11 05:40:13 +00:00
imp
a08ac34c17 o Add a nomatch routine so we whine when we don't know what to attach to
the card.
o Add comments about how we're doing the CIS activation.
o Add location and pnp info functions.
o Add better code to hopefully deal with ata cards better (and other drivers
  that allocate resources that we didn't preallocate from the CIS).  OLDCARD
  used to allow it, but NEWCARD was pickier.  I'm not 100% sure this works,
  but it doesn't break anything.
2002-10-07 23:05:33 +00:00
imp
61ae73678b Merge changes from NetBSD through version 1.17 of this file. These
give us slightly better error checking than before and interpret what
default bits mean better.  See the NetBSD CVS tree for the authors of
these changes (revs 1.10 .. 1.17).
2002-10-07 23:03:17 +00:00
imp
365f3d65f1 MFp4:
o Return the right string for CIS4_STR
	o kill obsolete comment about not doing something that we now do.
2002-10-07 07:18:32 +00:00
imp
5c300d06bb Better comment for the product ID thing. 2002-10-07 06:35:04 +00:00
imp
2b0481758d o Dike out the bogus reprobe stuff. It was getting in the way of newbus' own
reprobe code working.  This bogusness was thrust upon me.
o Don't delete the device if no drivers attach.  I had thrust this bogusness
  upon others.

These two changes make kldload of a pccard driver work again.
2002-09-10 06:32:18 +00:00
imp
44c91692ec regen for 1.34 2002-09-10 06:29:50 +00:00
imp
04ac07203d Add ARGOSY SP320
cis submitted by: phk
2002-09-10 06:29:09 +00:00
imp
b720c131c7 More in the continuing saga of phk vs his strange serial card.
In this installment, we learn that it is bad to access registers that
are only defined for mfc cards in the interrupt handler when we do not
in fact have a mfc card.  For MFC cards, we'll only call the ISR if
the this card interrupted bit is set.  For non mfc cards (which are
basically 90% of pccards in use), we always call the ISR and avoid
touching the suspect registers.  We always pacify the bit in the MFC
case on the off chance that will help in the itnerrupt handler not
being registed.
2002-09-04 06:53:37 +00:00
phk
d24190132a Drop another cookie to wet Warners appetite:
We need to call the drivers interrupt function even though the card is not
multifunction.
2002-09-03 11:24:25 +00:00
imp
480c5ff48a Make modems work:
Don't set the CCR_OPTION register when registering/deregistering
interrupts unless the card is a MFC card.  This makes a lot of cards
work that didn't work before.  These bits are only defined for MFC
cards.

Remove COOKIE_FOR_WARNER kludges that phk introduced.

Add more debug info.

Annoy the purists by committing two minor style nits at the same time.

Many thanks to phk.  He tracked this problem down to what was screwing
things up, so fixing it became trivially easy once the problem was
understood.
2002-08-31 18:34:30 +00:00
phk
bcd9be0b7d Different and more correct workaround for broken cards under NEWCARD:
don't spam the configuration index register.

I'm not sure where those bits truly belong, but spamming the config
index sure doesn't do us any good.
2002-08-31 16:07:17 +00:00
phk
18afceec82 Ignore all config entries which have a non-zero start I/O address.
This is a bandaid which makes some more PCCards work under NEWCARD
which would otherwise not work.

Cards with only fixed address windows still loose.
2002-08-31 14:38:24 +00:00
imp
9e7fb94cf8 pccbb -> cbb 2002-08-15 08:02:23 +00:00
imp
f685742637 Don't redundantly include \n in panic messages 2002-08-12 22:34:12 +00:00
imp
30e16b137a Eliminate the need for pccard_common.c by moving the function inline
in the .h file.  Make it static __inline to make sure that it doesn't
wind up defined in any files.

Also, fix a typo that said null_do_attach instead of null_do_probe.
2002-07-17 05:20:43 +00:00
imp
53ba5c7609 regen from pccarddevs 1.33 2002-07-17 04:02:52 +00:00
imp
2d94482b54 MFOpenBSD:
1.93; henning; MA401RA wi card
1.92; millert; elsa XI-325 wi card
1.91; fgsch; gemplus cpr400 smartcard reader
1.90; mickey; Nokia c110/c111 is prism2 card
1.89-1.86 (similar to what we do already)
2002-07-17 04:01:57 +00:00
takawata
d19ac116d6 Make oldcard and newcard kernel module work. 2002-05-30 17:38:00 +00:00
imp
200a76f1a4 Catchup to 1.32 2002-04-11 21:19:04 +00:00
imp
3b03394d5b Add ACTIONTEC HWC01170 from OpenBSD 2002-04-11 21:18:17 +00:00
imp
e1798dc814 catch up to 1.31 2002-04-05 16:25:34 +00:00
imp
022376dedf Add 3crwe77a 2002-04-05 16:25:03 +00:00
imp
6f0619b5a4 Regen for 1.30 pccarddevs 2002-04-02 05:47:08 +00:00
imp
ccea42acc9 Actually merge proxim rangelands and addtron awp-100 2002-04-02 05:46:10 +00:00
imp
acd0e06815 regen to 1.29 pccarddevs 2002-04-02 05:39:40 +00:00
imp
df2847c093 Merge from both NetBSD and OpenBSD's pcmciadevs:
NetBSD:
	1.163; martin; ELSA MicroLink mc all
	1.162; is; typo
	1.161; is; typo
	1.160; is; Add Lantech Fastnet/TX
OpenBSD:
	1.85; millert; proxim rangelan-ds
	1.84; provos; linksys wpc11
	1.83; mickey; now wires needed wlan
	1.82; mickey; socket low power wlan from netbsd [*]
	1.81; mickey; ericsson wlan
	1.80; fgsch; add openbsd tag back (not needed)
	1.79; fgsch; Netgear FA411
	1.78; mickey; simple spectrum25 from netbsd [*]
	1.77; mickey; emtac wavelan from netbsd [*]
	1.76; mickey; buffalo wavelans from netbsd [*]
	1.75; jakob; 3com wilress lan pccard
	1.74; mickey; linksys2 instant wireless
	1.73; mickey; oops (add closing quote)
	1.72; mickey; pcm100
[*] (already in freebsd)

Obtained from: NetBSD, OpenBSD
2002-04-02 05:39:07 +00:00
imp
835285fed8 Improve support of MFC cards (Multi-function cards). This commit
allows us to properly parse cards with attribute memory based CIS that
before wouldn't parse correctly, sometimes with a panic.  This allows
me to get my 3C562 modem/ethernet card to fail to attach due to
problems in the ep and sio drivers rather than due to problems in the
CIS parsing code :-).

We weren't setting the address to jump to for the function entries.
This caused us to only work when the addional entries were after the
first ones.  On the 3C562/3C563 card this was not the case.

We were also mapping Attribute memory when common memory was asked for
in the target of the LONGLINK_{A,C} or LONGLINK_MFC.

My IBM Home And Away Modem/LAN card still fails for reasons unknown.
2002-03-29 08:05:39 +00:00
imp
b8c72f4eaa Regen for 1.28 of pccarddevs 2002-03-17 05:06:37 +00:00
imp
31881ddbed Add support for the home Wireless Network airway wireless pcmcia card.
I cannot find where I got these patches, but I think it was from the
bsd-nomads mailing list.  Please contact me if you posted them there.
2002-03-17 05:05:42 +00:00
imp
03b0ddafe2 Make hw.pccard.debug and hw.pccard.cis_debug tunable/sysctl. Setting to 1
will enable more verbose debugging output from the pccard system.
2002-03-07 08:03:53 +00:00
shiba
3af9954d93 Add u_int16 prodext value in CISTPL_MANF_ID. This gets a fifth byte
when manufacturer id tuple length is 5. This change is for xe driver.
This is a dirty hack. But there is no better idea.

Reviewd by: imp
2002-02-20 14:30:46 +00:00
imp
ca03e62ab0 o Count the number of mem and io spaces we allocate. If none work, bail out
o Add some better debugging code.
o Minor style(9) fixes.
2002-02-19 05:04:37 +00:00
imp
de7d451aca Do the cast away of unsignedness in a way that is more commprehensible. 2002-02-19 05:01:43 +00:00
imp
fc3cad7e87 Null interrupt handlers should be OK, so if we don't have a function,
just return.
2002-02-10 05:04:20 +00:00
imp
001b5dc57d o Use bus_generic_setup_intr instead of bus_setup_intr.
o Call bus_generic_setup_intr and check its return value.  Don't setup
  func until we successfully get the interrupt from our parent.
o Add comments about some maybe questionable stuff so I can check later
  to make sure that it really is that way.
2002-02-10 03:34:44 +00:00
imp
d22d828b7d Boot verbosify printing the CIS, since we don't normally need to do that. 2002-02-09 21:34:06 +00:00
imp
4e8bb198e7 Remove DETACH_NOWARN 2002-02-07 06:43:29 +00:00
imp
a6ee5d93d9 Default debugging to OFF now. 2002-02-04 15:55:21 +00:00
imp
2eb20551ff Move cardaddr to memory structure.
Forgotten by: imp
Reminded by: Dave Cornejo
2002-01-29 16:57:50 +00:00
imp
a8d6fd7393 Sync to 1.27 of pccarddevs 2002-01-29 06:10:15 +00:00
imp
3f314d0de0 MFNetBSD:
1.159: sorting (not relevant to us, since I'd done thie before)
	1.158: joda; Ericsson PRISM2 WIRELEASS LAN CARD.
	1.157: aymeric Edimax Technology ethernet card
2002-01-29 06:09:39 +00:00
imp
c289a894f7 Regenerate from 1.26 pccarddevs 2002-01-08 20:52:57 +00:00
imp
56b014505e Catch up to NetBSD:
1.156 pooka; Socket Low-Power CF WLAN
	1.155 ichiro; IBM Smart Capture Card II
	1.152-154 ichiro; Fujitsu CF EtherCard and FMV-181,182,182A
	1.151 christos; Symbol Spectrum24
2002-01-08 20:52:23 +00:00
imp
9292ea9a4d Add support for suspending/resuming CardBus bridges.
We really should have and use power state information, but none exists
today.

Submitted by: YAMAMOTO Shigeru-san <shigeru@iij.ad.jp>
2001-12-15 05:58:28 +00:00
imp
e231bcb189 Sync to pccarddevs 1.25 2001-12-12 20:06:29 +00:00
imp
e2b68f4e4f Move LINKSYS2 to its correct numerical location.
Add BONDWELL B236 Game Card Joystick.  A PC Card joystick card.
2001-12-12 20:05:48 +00:00
imp
67df0b50e4 implement MFC links properly (and I think long links too). This make
the sprint wireless card try to attach.  Sadly, the pci code at the
bridge keeps this from happening.

Bug w/o PR: jhb :-)
2001-12-04 13:48:16 +00:00
imp
fc9dbdce84 Sync to 1.24 2001-11-28 08:33:41 +00:00
imp
7fa4817fe2 Merge from NetBSD:
1.147 (my changes to sync to FreeBSD's file)
	1.148 Buffalo AirStation CFtytpe WLAN Card (ichiro)
	1.149 IBM SCSI PCMCIA (yamt)
	1.150 <restore 1.148 lost in 1.149> (enami)
2001-11-28 08:33:12 +00:00
imp
335a26d4b8 Only call pccard_function_disable when we have a configured config
entry.  Otherwise we panic on boot for cards that we can't allocate a
config entry for (my 3.3V wavelan card currently fails thusly).
2001-11-26 07:14:00 +00:00
imp
e42e956dfb Weed out those pccard entries that match everything. These are too
dangerous to allow :-)

This should fix the ed1: <PLANEX ... bug.
2001-11-20 06:15:24 +00:00
imp
3b062a2907 Update to 1.23 pccarddevs 2001-11-19 06:28:20 +00:00
imp
c81de63164 Add ZOOM as one of the bgous vendors 2001-11-19 06:27:33 +00:00
imp
2f8016404c Update to 1.22 pccarddevs 2001-11-19 05:22:46 +00:00
imp
4d30d470db Nits to make it whitespace compatible with what I'm about to commit to NetBSD 2001-11-19 05:22:28 +00:00
imp
18df5bf636 Update to 1.21 pccarddevs 2001-11-19 05:11:50 +00:00
imp
15c4a90ac4 Merge NetBSD 1.146: Linksys Instant Wireless Network card.
Obtained From: NetBSD
2001-11-19 05:11:35 +00:00
imp
aed28d261d Update to 1.20 pccarddevs 2001-11-19 05:04:08 +00:00
imp
9dec539715 Merge NetBSD 1.145: Xircom XE2000 2001-11-19 05:02:55 +00:00
imp
d61787d6b5 Regenerate with 1.19 of pccarddevs 2001-11-16 06:59:27 +00:00
imp
4ab389c3ff Merge in most (hopefully all) of the devices that OpenBSD has that
NetBSD/FreeBSD doesn't have listed.
2001-11-16 06:58:47 +00:00
imp
3e552735d1 Sync to 1.18 of pccarddevs 2001-11-15 07:50:38 +00:00
imp
e1f7a9c3c0 Add vendor for NDC. 2001-11-15 07:50:09 +00:00
imp
686e52b5ce Hoist the Card/Card2 macros that I invented for the wi driver into
pccard layer and rename them PCMCIA_CARD and PCMCIA_CARD2 respectively
(note, this is being done with an eye towards NetBSD integreation so
it is easier to keep lists of cards between us and them in sync).

Use this in the an and wi drivers.
2001-11-15 06:37:13 +00:00
imp
bdcad4abe9 Sync to 1.17 of pccarddevs 2001-11-11 23:52:49 +00:00
imp
d0d2eaf8b0 Add GENTEK as one of the bogus vendors we need to id cards from the cis 2001-11-11 23:52:28 +00:00
imp
eac3f73dc1 Sync to 1.16 pccarddevs to get new PCMCIA_ symbols 2001-11-11 20:15:47 +00:00
imp
db8e4ff08f Move from using PCCARD_ symbols gereated from this file to using PCMCIA_
symbols so that driver lists are easier to share and keep in sync.
2001-11-11 20:15:06 +00:00
imp
68f56cbafe Sync to 1.15 pccarddevs 2001-11-11 19:37:28 +00:00
imp
22a47e8fea MFNetBSD:
1.140	imp (that's me)		sort the file
	1.141	christos		Another cdrom
	1.142	mjl			Corega PCCB-11
	1.143	mjl			Corega PCC-TD
	1.144	ichiro			ELSA CF wavelan card XI-800
2001-11-11 19:36:44 +00:00
imp
da7f535b3c Regen. 2001-10-05 05:32:51 +00:00
imp
44d85e12de MFNetBSD:
1.139: augustss; Add EigerLabs sound card.
	1.138: ichiro; Typo
	1.137: ichiro; GEMTEK CF-size WaveLAN card based on Prism2.5 eval
	1.136: ichiro; Symbol Spctrum24 LA4100 Series CF WaveLAN card
	1.135: pooka; Psion Gold Card
	1.134: christos; zonet zen (Henrik Berglund)
	1.133: christos; dlink-660+ (janberg@netbsd.org)
	1.132: itojun; 3Com 3CRWE62092A Wireless LAN
2001-10-05 05:32:27 +00:00
shiba
5757abe58a Update cis tuple parser, add a pccarddevs entry,
and improve PCCARD_IVAR_ETHADDR in pccard_read_ivar().

Change points:

(1) Read Function Ext tuple.
(2) Add Ratoc REX-R280 entry(fe driver).
(3) Take ether address from function ext tuple.

Reviewed by: imp
Obtained from: NetBSD
2001-09-02 06:37:41 +00:00
jon
10f5273e6a Make pccard_product_lookup non-static again...
When something is exported, do not mark it as static for no apparent reason...

Broken by: me
2001-08-27 11:28:00 +00:00