#
302408 |
|
07-Jul-2016 |
gjb |
Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle. Prune svn:mergeinfo from the new branch, as nothing has been merged here.
Additional commits post-branch will follow.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
201453 |
|
03-Jan-2010 |
imp |
cardbus -> CardBus
|
#
189683 |
|
11-Mar-2009 |
imp |
Remove old compat method that's no longer needed (and hasn't been since just before 6.0).
|
#
188180 |
|
05-Feb-2009 |
imp |
do_product_lookup should return a const struct pccard_product *.
|
#
150533 |
|
24-Sep-2005 |
imp |
Remove OLDCARD vestiges from here
|
#
150098 |
|
13-Sep-2005 |
imp |
Add a few new functions interfaces to allow reading/writing attribute memory, the CCR and a tweak to cis_scan.
|
#
147711 |
|
01-Jul-2005 |
imp |
Add a much-requested feature: The ability for pccard attachments to scan the CIS for interesting tuples. 95% of what can be obtained from the CIS is harvested by the pccard layer and presented to the user in standard function calls. However, there are special needs at times where the standard stuff doesn't suffice. This is for those special cases.
CARD_SCAN_CIS(device_get_parent(dev), function, argp) scans the CIS of the card, passing each tuple to function with the tuple and argp as its arguments. Returning 0 continues the scan, while returning 1 terminates the scan. The value of the last invocation of function is returned from this function.
int (*pccard_scan_t)(struct pccard_tuple *tuple, void *argp) function called for each tuple. Elements of the CIS tuple can be read with pccard_tuple_read_{1,2,3,4,n}(). You are reading the actual tuple memory each time, in case your card has registers in the CIS.
# I suppose these things should be documented in pccard(4) or something like # that.
# I plan on unifying cardbus CIS support in a similar way.
Approved by: re (scottl)
|
#
141936 |
|
15-Feb-2005 |
imp |
Remove more deadwood that never got implemented in NEWCARD, since NEWCARD went a different direction than was anticipated when these compatibility shims were added.
|
#
141882 |
|
14-Feb-2005 |
imp |
Remove card_get_function. It looks like it was intended to be a bridge between OLDCARD and NEWCARD for drivers to inquire after the function number (eg, 0, 1, 2). Nobody ever used it, so retire it with honors. NEWCARD never implemented it, and the same information can be obtained by the pccard_get_function_number().
MFC After: 3 days
|
#
140692 |
|
24-Jan-2005 |
imp |
u_intXX_t -> uintXX_t
|
#
139749 |
|
05-Jan-2005 |
imp |
Start each of the license/copyright comments with /*-, minor shuffle of lines
|
#
129798 |
|
28-May-2004 |
imp |
Include required machine/bus.h
|
#
120868 |
|
07-Oct-2003 |
imp |
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.
|
#
120848 |
|
06-Oct-2003 |
imp |
Remove the cis reading bus methods. They were never implemented and there's been some critism about the API not being lock friendly.
|
#
106362 |
|
02-Nov-2002 |
imp |
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
|
#
103171 |
|
10-Sep-2002 |
imp |
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.
|
#
100218 |
|
17-Jul-2002 |
imp |
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.
|
#
97613 |
|
30-May-2002 |
takawata |
Make oldcard and newcard kernel module work.
|
#
90338 |
|
07-Feb-2002 |
imp |
Remove DETACH_NOWARN
|
#
82378 |
|
26-Aug-2001 |
jon |
Part two of this NEWCARD update:
Briefly, the significant changes include: * Way better resource management in pccbb, pccard and cardbus. * pccard hot-removal now appears to work. * support pre-fetchable memory in cardbus. * update cardbus to support new pci bus interface functions. * Fix CIS reading to no longer use rman_get_virtual().
What's not there, but in the works: * pccard needs to do interrupt properly and not read the ISR on single function cards. * real resource management for pccard * a complete implementation of CIS parsing * need to look into how to correctly use mutex in pccbb
|
#
82376 |
|
26-Aug-2001 |
jon |
Non-functional changes to NEWCARD stuff.
This is the first part of a two-part update to NEWCARD. Changes in this commit are non-functional, and includes the following: * indentation and other changes to meet style(9). * other minor style consistancy changes * addition of comments * renaming of device_t variables to be consistant across all of NEWCARD.
(note that not all style violations are fixed in this commit -- those that aren't will be clobbered by the next commit.)
|
#
80090 |
|
21-Jul-2001 |
assar |
null_do_probe: mark as unused
|
#
74636 |
|
22-Mar-2001 |
imp |
First step towards making loadable modules independent of having pccard in the kernel for those drivers with pccard attachments. This makes the compat layer a little larger by introducing some inlines, but should almost make it possible to have independent attachments. The pccard_match function are the only one left, which I will take care of shortly.
|
#
70748 |
|
07-Jan-2001 |
imp |
o Now that I've had time to test the new interface, reintegrate it back in. o Fix OLDCARD to use the new interface. o Rename the offsetp argument to deltap to more closely reflect what it is returning (it returns the delta from the requested value to the actual value). o Remove duplicate $FreeBSD$ in pccbb.c o Allow deltap to be NULL. o Convert new isa pcic driver and add XXX comments that this function isn't actually implemented there (which means that NEWCARD pccard stuff won't work there until it is). o Revert attempts to make old inferface work in NEWCARD.
Subitted by: peter (Parts of the new version code)
|
#
70746 |
|
07-Jan-2001 |
imp |
Undo the interface change to CARD_GET_MEMORY_OFFSET. It wasn't tested by even a compile of the OLDCARD code, was unapproved by me the keeper of OLDCARD and broke OLDCARD and the ray driver.
Adjust new code to cope with the older interface.
If the interface changes in the future, it ***MUST*** be cleared by me so that the OLDCARD impacts taken into account. It code in card_if.m is used jointly by both OLDCARD and NEWCARD.
|
#
70715 |
|
06-Jan-2001 |
jon |
* Better kld support in pccbb/cardbus - pccbb no longer needs to remember whether a card is inserted. - pccbb reissues insertion on load of cardbus/pccard modules. - got rid of unnecessary delays in power functions. - Cardbus children are no longer deleted if probe/attach fails. - non-attached child devices are reprobed at driver_added.
* CARD interface to read CIS - added card_cis_read/card_cis_free interface to read arbitrary CIS data. This currently is only implemented in cardbus.
* pccard begins to work - pccard can now use higher memory space (and uses it by default). - set_memory_offset interface changed. - fixed ccr access, which was broken at multiple locations. - implement an interrupt handler - pccard can now share interrupts. - resource alloc/release/activate/deactivate functions gutted: some resources are allocated by the bridge before the child device is probed or attached. Thus the resource "belongs" to the bridge, and the pccard_*_resource functions need to fudge the owner/rid. - changed some error conditions to panics to speed debugging.
* Mutex fix - Giant is entered at the beginning of thread
|
#
69308 |
|
28-Nov-2000 |
jon |
Oops, broke newcard because I forgot to commit this in my last round of changes to pccbb.c
|
#
66058 |
|
19-Sep-2000 |
imp |
Implement indirection in the pccard probe/attach. This should make it possible to have different probe/attach semantics between the two systems and yet still use the same driver for both.
Compatibility methods for OLDCARD drivers. We use these routines to make it possible to call the OLDCARD driver's probe routine in the context that it expects. For OLDCARD these are implemented as pass throughs to the device_{probe,attach} routines. For NEWCARD they are implemented such such that probe becomes strictly a matching routine and attach does both the old probe and old attach.
compat devices should use the following:
/* Device interface */ DEVMETHOD(device_probe), pccard_compat_probe), DEVMETHOD(device_attach), pccard_compat_attach), /* Card interface */ DEVMETHOD(card_compat_match, foo_match), /* newly written */ DEVMETHOD(card_compat_probe, foo_probe), /* old probe */ DEVMETHOD(card_compat_attach, foo_attach), /* old attach */
This will allow a single driver binary image to be used for both OLDCARD and NEWCARD.
Drivers wishing to not retain OLDCARD compatibility needn't do this.
ep driver minorly updated.
sn driver updated more than minorly. Add module dependencies to allow module to load. Also change name to if_sn. Add some debugging code. attempt to fix the cannot allocate memory problem I'd been seeing. Minor formatting nits.
|
#
64544 |
|
11-Aug-2000 |
imp |
Define get_memory_offset method
|
#
61779 |
|
18-Jun-2000 |
imp |
Add new functions. Also add comments to existing functions. These are needed for the pccard changes I've just committed.
|
#
59427 |
|
20-Apr-2000 |
imp |
Remove bogus comment
|
#
59272 |
|
16-Apr-2000 |
imp |
Include <sys/bus.h>, which is needed after Doug's latest object changes.
|
#
59193 |
|
13-Apr-2000 |
imp |
checkpoint latest pccard/pcic hacking:
o Eliminate cross calls between the devices. Instead move to using the newbus messaging system. Added three new card calls: attach_card, detach_card, get_type. o Eliminate interrupt routine in pccard we never use. o Move from deactivate to detach for removing cards. o Start mapping CIS memory, but it is broken and causes panics. At least it is closer to working than before. o Eliminate struct device everywhere. It was bogus. o Initialize softc for pccard device so we have valid pointers to ourselves. o Implement routine to find the pcic ivar for a child device of the pccard so we can use it to talk to the pcic hardware. o Lots of minor tiding up.
This version now panics when we try to read the CIS. The next batch of work to make this work is what was outlined in my posting to mobile about resource allocation and such.
|
#
58581 |
|
26-Mar-2000 |
imp |
Minor changes to some of the interfaces. Remove RF_PCCARD_ATTR in anticipation of removing it from sys/rman.h Add interface for setting "attributes" of pccard/cardbus devices. Minor formatting nits.
|
#
53855 |
|
28-Nov-1999 |
imp |
Add resource activation routines to pcic driver. Minor cleanup of socket attach code. We now have at least a chance for pccard devices appearing in the future.
This is a snapshot of ongoing work. Proceed at your own risk.
|