The NetBSD Project

CVS log for src/sys/dev/pcmcia/pcmciavar.h

[BACK] Up to [cvs.netbsd.org] / src / sys / dev / pcmcia

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.35 / (download) - annotate - [select for diffs], Tue Jul 26 22:24:36 2011 UTC (10 months ago) by dyoung
Branch: MAIN
CVS Tags: yamt-pagecache-base5, yamt-pagecache-base4, yamt-pagecache-base3, yamt-pagecache-base2, yamt-pagecache-base, yamt-pagecache, netbsd-6-base, netbsd-6, jmcneill-usbmp-pre-base2, jmcneill-usbmp-base9, jmcneill-usbmp-base8, jmcneill-usbmp-base7, jmcneill-usbmp-base6, jmcneill-usbmp-base5, jmcneill-usbmp-base4, jmcneill-usbmp-base3, jmcneill-usbmp-base2, jmcneill-usbmp-base, jmcneill-usbmp, jmcneill-audiomp3-base, jmcneill-audiomp3, HEAD
Changes since 1.34: +1 -9 lines
Diff to previous 1.34 (colored)

Don't copy iobase and iosize members from pcmciabus_attach_args to the
pcmcia_softc because they're not used in any meaningful way.

Revision 1.32.68.2 / (download) - annotate - [select for diffs], Sat May 16 10:41:42 2009 UTC (3 years ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.32.68.1: +6 -6 lines
Diff to previous 1.32.68.1 (colored) to branchpoint 1.32 (colored) next main 1.33 (colored)

sync with head

Revision 1.33.10.1 / (download) - annotate - [select for diffs], Wed May 13 17:21:09 2009 UTC (3 years ago) by jym
Branch: jym-xensuspend
Changes since 1.33: +6 -6 lines
Diff to previous 1.33 (colored) next main 1.34 (colored)

Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.

Revision 1.34 / (download) - annotate - [select for diffs], Tue May 12 14:42:19 2009 UTC (3 years ago) by cegger
Branch: MAIN
CVS Tags: yamt-nfs-mp-base9, yamt-nfs-mp-base8, yamt-nfs-mp-base7, yamt-nfs-mp-base6, yamt-nfs-mp-base5, yamt-nfs-mp-base4, yamt-nfs-mp-base11, yamt-nfs-mp-base10, uebayasi-xip-base4, uebayasi-xip-base3, uebayasi-xip-base2, uebayasi-xip-base1, uebayasi-xip-base, uebayasi-xip, rmind-uvmplock-nbase, rmind-uvmplock-base, rmind-uvmplock, matt-premerge-20091211, matt-mips64-premerge-20101231, jymxensuspend-base, jym-xensuspend-nbase, jym-xensuspend-base, jruoho-x86intr-base, jruoho-x86intr, cherry-xenmp-base, cherry-xenmp, bouyer-quota2-nbase, bouyer-quota2-base, bouyer-quota2
Changes since 1.33: +6 -6 lines
Diff to previous 1.33 (colored)

struct device * -> device_t, no functional changes intended.

Revision 1.32.68.1 / (download) - annotate - [select for diffs], Mon May 4 08:13:15 2009 UTC (3 years ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)

sync with head.

Revision 1.32.64.1 / (download) - annotate - [select for diffs], Sun Sep 28 10:40:30 2008 UTC (3 years, 7 months ago) by mjf
Branch: mjf-devfs2
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored) next main 1.33 (colored)

Sync with HEAD.

Revision 1.32.70.1 / (download) - annotate - [select for diffs], Thu Sep 18 04:35:09 2008 UTC (3 years, 8 months ago) by wrstuden
Branch: wrstuden-revivesa
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored) next main 1.33 (colored)

Sync with wrstuden-revivesa-base-2.

Revision 1.32.72.1 / (download) - annotate - [select for diffs], Fri Jul 18 16:37:43 2008 UTC (3 years, 10 months ago) by simonb
Branch: simonb-wapbl
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored) next main 1.33 (colored)

Sync with head.

Revision 1.33 / (download) - annotate - [select for diffs], Thu Jul 3 19:07:43 2008 UTC (3 years, 10 months ago) by drochner
Branch: MAIN
CVS Tags: yamt-nfs-mp-base3, wrstuden-revivesa-base-4, wrstuden-revivesa-base-3, wrstuden-revivesa-base-2, simonb-wapbl-nbase, simonb-wapbl-base, nick-hppapmap-base4, nick-hppapmap-base3, nick-hppapmap-base2, nick-hppapmap-base, nick-hppapmap, netbsd-5-base, netbsd-5-1-RELEASE, netbsd-5-1-RC4, netbsd-5-1-RC3, netbsd-5-1-RC2, netbsd-5-1-RC1, netbsd-5-1-2-RELEASE, netbsd-5-1-1-RELEASE, netbsd-5-1, netbsd-5-0-RELEASE, netbsd-5-0-RC4, netbsd-5-0-RC3, netbsd-5-0-RC2, netbsd-5-0-RC1, netbsd-5-0-2-RELEASE, netbsd-5-0-1-RELEASE, netbsd-5-0, netbsd-5, mjf-devfs2-base, matt-nb5-pq3-base, matt-nb5-pq3, matt-nb5-mips64-u2-k2-k4-k7-k8-k9, matt-nb5-mips64-u1-k1-k5, matt-nb5-mips64-premerge-20101231, matt-nb5-mips64-premerge-20091211, matt-nb5-mips64-k15, matt-nb5-mips64, matt-nb4-mips64-k7-u2a-k9b, matt-mips64-base2, haad-nbase2, haad-dm-base2, haad-dm-base1, haad-dm-base, haad-dm, ad-audiomp2-base, ad-audiomp2
Branch point for: jym-xensuspend
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)

split device/softc
Now I'm through - all my devices are split.

Revision 1.32.38.2 / (download) - annotate - [select for diffs], Tue Nov 6 14:27:31 2007 UTC (4 years, 6 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.32.38.1: +1 -6 lines
Diff to previous 1.32.38.1 (colored) to branchpoint 1.32 (colored) next main 1.33 (colored)

Refactor PNP API:
- Make suspend/resume directly a device functionality. It consists of
  three layers (class logic, device logic, bus logic), all of them being
  optional. This replaces D0/D3 transitions.
- device_is_active returns true if the device was not disabled and was
  not suspended (even partially), device_is_enabled returns true if the
  device was enabled.
- Change pnp_global_transition into pnp_system_suspend and
  pnp_system_resume. Before running any suspend/resume handlers, check
  that all currently attached devices support power management and bail
  out otherwise. The latter is not done for the shutdown/panic case.
- Make the former bus-specific generic network handlers a class handler.
- Make PNP message like volume up/down/toogle PNP events. Each device
  can register what events they are interested in and whether the handler
  should be global or not.
- Introduce device_active API for devices to mark themselve in use from
  either the system or the device. Use this to implement the idle handling
  for audio and input devices. This is intended to replace most ad-hoc
  watchdogs as well.
- Fix somes situations in which audio resume would lose mixer settings.
- Make USB host controllers better deal with suspend in the light of
  shared interrupts.
- Flush filesystem cache on suspend.
- Flush disk caches on suspend. Put ATA disks into standby on suspend as
  well.
- Adopt drivers to use the new PNP API.
- Fix a critical bug in the generic cardbus layer that made D0->D3
  break.
- Fix ral(4) to set if_stop.
- Convert cbb(4) to the new PNP API.
- Apply the PCI Express SCI fix on resume again.

Revision 1.32.38.1 / (download) - annotate - [select for diffs], Tue Sep 4 15:05:22 2007 UTC (4 years, 8 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.32: +6 -1 lines
Diff to previous 1.32 (colored)

Add a basic generic network power management handler for PCMCIA as well.
Contrary to the versions for PCI/Cardbus, expect the caller to provide
the status variable as we currently have no way in hardware to do that.

This handler should be extended to power down/power up the slots on
D0/D3 transistions.

Revision 1.31.4.1 / (download) - annotate - [select for diffs], Sat Sep 9 02:53:55 2006 UTC (5 years, 8 months ago) by rpaulo
Branch: rpaulo-netinet-merge-pcb
Changes since 1.31: +2 -1 lines
Diff to previous 1.31 (colored) next main 1.32 (colored)

sync with head

Revision 1.30.4.1 / (download) - annotate - [select for diffs], Wed Jun 21 15:06:14 2006 UTC (5 years, 11 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.30: +2 -1 lines
Diff to previous 1.30 (colored) next main 1.31 (colored)

sync with head.

Revision 1.31.6.1 / (download) - annotate - [select for diffs], Sat Apr 22 11:39:25 2006 UTC (6 years, 1 month ago) by simonb
Branch: simonb-timecounters
CVS Tags: simonb-timcounters-final
Changes since 1.31: +2 -1 lines
Diff to previous 1.31 (colored) next main 1.32 (colored)

Sync with head.

Revision 1.31.2.1 / (download) - annotate - [select for diffs], Wed Mar 1 09:28:28 2006 UTC (6 years, 2 months ago) by yamt
Branch: yamt-uio_vmspace
Changes since 1.31: +2 -1 lines
Diff to previous 1.31 (colored) next main 1.32 (colored)

sync with head.

Revision 1.32 / (download) - annotate - [select for diffs], Thu Feb 23 03:18:42 2006 UTC (6 years, 3 months ago) by gdamore
Branch: MAIN
CVS Tags: yamt-x86pmap-base4, yamt-x86pmap-base3, yamt-x86pmap-base2, yamt-x86pmap-base, yamt-x86pmap, yamt-uio_vmspace-base5, yamt-splraiseipl-base5, yamt-splraiseipl-base4, yamt-splraiseipl-base3, yamt-splraiseipl-base2, yamt-splraiseipl-base, yamt-splraiseipl, yamt-pf42-baseX, yamt-pf42-base4, yamt-pf42-base3, yamt-pf42-base2, yamt-pf42-base, yamt-pf42, yamt-pdpolicy-base9, yamt-pdpolicy-base8, yamt-pdpolicy-base7, yamt-pdpolicy-base6, yamt-pdpolicy-base5, yamt-pdpolicy-base4, yamt-pdpolicy-base3, yamt-pdpolicy-base2, yamt-pdpolicy-base, yamt-pdpolicy, yamt-nfs-mp-base2, yamt-nfs-mp-base, yamt-lazymbuf-base15, yamt-lazymbuf-base14, yamt-kmem-base3, yamt-kmem-base2, yamt-kmem-base, yamt-kmem, yamt-idlelwp-base8, yamt-idlelwp, wrstuden-revivesa-base-1, wrstuden-revivesa-base, wrstuden-fixsa-newbase, wrstuden-fixsa-base-1, wrstuden-fixsa-base, wrstuden-fixsa, vmlocking2-base3, vmlocking2-base2, vmlocking2-base1, vmlocking2, vmlocking-nbase, vmlocking-base, vmlocking, thorpej-atomic-base, thorpej-atomic, simonb-timecounters-base, rpaulo-netinet-merge-pcb-base, reinoud-bufcleanup-nbase, reinoud-bufcleanup-base, reinoud-bufcleanup, post-newlock2-merge, peter-altq-base, peter-altq, nick-net80211-sync-base, nick-net80211-sync, nick-csl-alignment-base5, nick-csl-alignment-base, nick-csl-alignment, newlock2-nbase, newlock2-base, newlock2, netbsd-4-base, netbsd-4-0-RELEASE, netbsd-4-0-RC5, netbsd-4-0-RC4, netbsd-4-0-RC3, netbsd-4-0-RC2, netbsd-4-0-RC1, netbsd-4-0-1-RELEASE, netbsd-4-0, netbsd-4, mjf-ufs-trans-base, mjf-ufs-trans, mjf-devfs-base, mjf-devfs, matt-nb4-arm-base, matt-nb4-arm, matt-mips64-base, matt-mips64, matt-armv6-prevmlocking, matt-armv6-nbase, matt-armv6-base, matt-armv6, keiichi-mipv6-nbase, keiichi-mipv6-base, keiichi-mipv6, jmcneill-pm-base, jmcneill-base, hpcarm-cleanup-nbase, hpcarm-cleanup-base, hpcarm-cleanup, gdamore-uart-base, gdamore-uart, elad-kernelauth-base, elad-kernelauth, cube-autoconf-base, cube-autoconf, chap-midi-nbase, chap-midi-base, chap-midi, bouyer-xeni386-nbase, bouyer-xeni386-merge1, bouyer-xeni386-base, bouyer-xeni386, bouyer-xenamd64-base2, bouyer-xenamd64-base, bouyer-xenamd64, ad-socklock-base1, ad-audiomp-base, ad-audiomp, abandoned-netbsd-4-base, abandoned-netbsd-4
Branch point for: yamt-nfs-mp, wrstuden-revivesa, simonb-wapbl, mjf-devfs2, jmcneill-pm
Changes since 1.31: +2 -1 lines
Diff to previous 1.31 (colored)

Add new ihandle member to pcmcia_io_handle, similar to pcmcia_mem_handle's
mhandle structure.  This is for opaque use by pcmcia chipsets.

Revision 1.31 / (download) - annotate - [select for diffs], Sun Dec 11 12:23:23 2005 UTC (6 years, 5 months ago) by christos
Branch: MAIN
Branch point for: yamt-uio_vmspace, simonb-timecounters, rpaulo-netinet-merge-pcb
Changes since 1.30: +1 -1 lines
Diff to previous 1.30 (colored)

merge ktrace-lwp.

Revision 1.28.4.1 / (download) - annotate - [select for diffs], Fri Apr 29 11:29:13 2005 UTC (7 years ago) by kent
Branch: kent-audio2
Changes since 1.28: +41 -42 lines
Diff to previous 1.28 (colored) next main 1.29 (colored)

sync with -current

Revision 1.28.6.2 / (download) - annotate - [select for diffs], Sat Mar 19 08:35:35 2005 UTC (7 years, 2 months ago) by yamt
Branch: yamt-km
Changes since 1.28.6.1: +2 -2 lines
Diff to previous 1.28.6.1 (colored) to branchpoint 1.28 (colored) next main 1.29 (colored)

sync with head.  xen and whitespace.  xen part is not finished.

Revision 1.17.6.7 / (download) - annotate - [select for diffs], Fri Mar 4 16:49:39 2005 UTC (7 years, 2 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.17.6.6: +2 -2 lines
Diff to previous 1.17.6.6 (colored) to branchpoint 1.17 (colored) next main 1.18 (colored)

Sync with HEAD.

Hi Perry!

Revision 1.30 / (download) - annotate - [select for diffs], Sun Feb 27 00:27:43 2005 UTC (7 years, 2 months ago) by perry
Branch: MAIN
CVS Tags: yamt-vop-base3, yamt-vop-base2, yamt-vop-base, yamt-vop, yamt-readahead-pervnode, yamt-readahead-perfile, yamt-readahead-base3, yamt-readahead-base2, yamt-readahead-base, yamt-readahead, yamt-km-base4, yamt-km-base3, thorpej-vnode-attr-base, thorpej-vnode-attr, netbsd-3-base, netbsd-3-1-RELEASE, netbsd-3-1-RC4, netbsd-3-1-RC3, netbsd-3-1-RC2, netbsd-3-1-RC1, netbsd-3-1-1-RELEASE, netbsd-3-1, netbsd-3-0-RELEASE, netbsd-3-0-RC6, netbsd-3-0-RC5, netbsd-3-0-RC4, netbsd-3-0-RC3, netbsd-3-0-RC2, netbsd-3-0-RC1, netbsd-3-0-3-RELEASE, netbsd-3-0-2-RELEASE, netbsd-3-0-1-RELEASE, netbsd-3-0, netbsd-3, ktrace-lwp-base, kent-audio2-base
Branch point for: yamt-lazymbuf
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

nuke trailing whitespace

Revision 1.28.6.1 / (download) - annotate - [select for diffs], Sat Feb 12 18:17:50 2005 UTC (7 years, 3 months ago) by yamt
Branch: yamt-km
Changes since 1.28: +40 -41 lines
Diff to previous 1.28 (colored)

sync with head.

Revision 1.17.6.6 / (download) - annotate - [select for diffs], Fri Feb 4 11:47:09 2005 UTC (7 years, 3 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.17.6.5: +40 -41 lines
Diff to previous 1.17.6.5 (colored) to branchpoint 1.17 (colored)

Sync with HEAD.

Revision 1.29 / (download) - annotate - [select for diffs], Fri Feb 4 02:10:45 2005 UTC (7 years, 3 months ago) by perry
Branch: MAIN
CVS Tags: yamt-km-base2, matt-timespec
Changes since 1.28: +40 -41 lines
Diff to previous 1.28 (colored)

de-__P

Revision 1.17.6.5 / (download) - annotate - [select for diffs], Tue Sep 21 13:32:22 2004 UTC (7 years, 8 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.17.6.4: +1 -1 lines
Diff to previous 1.17.6.4 (colored) to branchpoint 1.17 (colored)

Fix the sync with head I botched.

Revision 1.17.6.4 / (download) - annotate - [select for diffs], Sat Sep 18 14:50:23 2004 UTC (7 years, 8 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.17.6.3: +1 -1 lines
Diff to previous 1.17.6.3 (colored) to branchpoint 1.17 (colored)

Sync with HEAD.

Revision 1.17.6.3 / (download) - annotate - [select for diffs], Wed Aug 25 06:58:43 2004 UTC (7 years, 9 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.17.6.2: +5 -5 lines
Diff to previous 1.17.6.2 (colored) to branchpoint 1.17 (colored)

Sync with HEAD.

Revision 1.28 / (download) - annotate - [select for diffs], Thu Aug 12 19:59:07 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
CVS Tags: yamt-km-base, kent-audio1-beforemerge, kent-audio1-base, kent-audio1
Branch point for: yamt-km, kent-audio2
Changes since 1.27: +2 -2 lines
Diff to previous 1.27 (colored)

Simplify a little.  Pass down the card type from pcmcia_function_enable(),
which just gets it from the config entry for the function it's enabling.
Multifunction cards are defined to be of type I/O on every function, so there
is no possibility of accidentally switching.

Revision 1.27 / (download) - annotate - [select for diffs], Thu Aug 12 17:31:06 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.26: +2 -1 lines
Diff to previous 1.26 (colored)

If the card is being detached, do not try to write the CCR to disable the
function.

Revision 1.26 / (download) - annotate - [select for diffs], Thu Aug 12 16:04:20 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.25: +3 -4 lines
Diff to previous 1.25 (colored)

My previous understanding of the I/O base/limit registers was incorrect.
However, so was the old code.  Now it works correctly.  :-)

Revision 1.17.6.2 / (download) - annotate - [select for diffs], Thu Aug 12 11:42:05 2004 UTC (7 years, 9 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.17.6.1: +33 -13 lines
Diff to previous 1.17.6.1 (colored) to branchpoint 1.17 (colored)

Sync with HEAD.

Revision 1.25 / (download) - annotate - [select for diffs], Wed Aug 11 00:18:20 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.24: +2 -1 lines
Diff to previous 1.24 (colored)

Rather than having a call up from the low-level driver to get the card type,
instead have a call down from the PCMCIA mid-layer to set it.  Use this from
pcmcia_function_enable().  (Currently the policy is the same, but this would
allow for more flexibility in deciding which mode to use.)

Now it is safe to hold the socket enabled during attach, so do that.  Only
one enable/disable cycle to attach a card now!

Revision 1.24 / (download) - annotate - [select for diffs], Tue Aug 10 18:39:08 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.23: +5 -6 lines
Diff to previous 1.23 (colored)

Enhance pcmcia_product_lookup():
* Remove the "expected function" value.  This was just causing problems with
  multifunction cards.  Differentiating the functions is better done by
  checking the function type (which we now do in ep and sm).
* Add support for matching CIS strings.  This necessitated changing the calling
  pattern a little too.

Use this enhanced version rather than driver-specific versions that do the
same thing.

Also, remove the last vestiges of PCMCIA_STR_*.

Revision 1.23 / (download) - annotate - [select for diffs], Tue Aug 10 02:50:52 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.22: +19 -1 lines
Diff to previous 1.22 (colored)

Be robust against child devices failing to handle the socket refcnt properly --
force it to 0 when a card is detached, possibly disabling the socket in the
process.

Add several new functions:
* pcmcia_config_alloc(pf, cfe)
  Tries to allocate all the I/O and memory spaces in a config entry.
* pcmcia_config_free(pf)
  Frees all the I/O and memory spaces for the active configuration.
* pcmcia_config_map(pf)
  Maps all the allocated I/O and memory spaces for the active configuration.
* pcmcia_config_unmap(pf)
  Unmaps all the allocated I/O and memory spaces for the active configuration.

And two higher-level functions:
* pcmcia_function_configure(pf, validator)
  Tries to find a CIS config entry that it can allocate the spaces for.  Each
  entry is verified by calling the "validator" function -- which can also do
  card- and driver-specific fixups.  If successful, the regions are all mapped.
* pcmcia_function_unconfigure(pf)
  Equivalent to calling both pcmcia_config_unmap() and pcmcia_config_free().

Most drivers are expected to use the latter two functions, which will greatly
reduce the amount of crufty code.

Revision 1.22 / (download) - annotate - [select for diffs], Mon Aug 9 20:02:36 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.21: +2 -4 lines
Diff to previous 1.21 (colored)

Dispense with all the interrupt multiplexing code here, and assume that the
underlying implementation DTRT.  This has the side effect of causing us to
ignore the INTR and INTRACK bits in the CCR -- but this seems for the best
anyway, since they are not reliably implemented.  (I note that Linux doesn't
bother either.)

Revision 1.21 / (download) - annotate - [select for diffs], Sun Aug 8 23:17:13 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.20: +6 -5 lines
Diff to previous 1.20 (colored)

Remove the "offset" and "size" arguments to pcmcia_io_map().  In the singular
case (ne@pcmcia) where we were using these to create a subregion, it is better
handled by calling bus_space_subregion().

Now there is a 1:1 mapping between I/O spaces in the config table and windows
mapped in the function.  Rework the multifunction mapping code to take
advantage of this by using both I/O base addresses if necessary.

Revision 1.20 / (download) - annotate - [select for diffs], Sun Aug 8 05:33:04 2004 UTC (7 years, 9 months ago) by mycroft
Branch: MAIN
Changes since 1.19: +4 -1 lines
Diff to previous 1.19 (colored)

pcmcia_socket_{enable,disable}() weren't used.  Reimplement them as public
functions taking a pcmcia* device structure.

XXX This is a method of last resort for dealing with stupid/insane cards that
we need to probe harder before we can choose a config entry.  It should not be
used by most drivers.

Revision 1.17.6.1 / (download) - annotate - [select for diffs], Tue Aug 3 10:50:18 2004 UTC (7 years, 9 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.17: +7 -9 lines
Diff to previous 1.17 (colored)

Sync with HEAD

Revision 1.19 / (download) - annotate - [select for diffs], Wed Jul 7 06:43:22 2004 UTC (7 years, 10 months ago) by mycroft
Branch: MAIN
Changes since 1.18: +2 -2 lines
Diff to previous 1.18 (colored)

More cleanup:
* Print "devinfo" in a canonial place (like we do in the SCSI code).
* Use aprint_{error,normal}() during attach.
* More PCMCIA_STR_* removal.

Revision 1.15.10.1 / (download) - annotate - [select for diffs], Tue Oct 21 03:45:29 2003 UTC (8 years, 7 months ago) by jmc
Branch: netbsd-1-6
CVS Tags: netbsd-1-6-PATCH002-RELEASE, netbsd-1-6-PATCH002-RC4, netbsd-1-6-PATCH002-RC3, netbsd-1-6-PATCH002-RC2, netbsd-1-6-PATCH002-RC1, netbsd-1-6-PATCH002
Changes since 1.15: +8 -4 lines
Diff to previous 1.15 (colored) next main 1.16 (colored)

Pullup to rev 1.17 (requested in ticket #699)
Enable support for multi-function pcmcia cards.

Revision 1.18 / (download) - annotate - [select for diffs], Tue Jul 8 10:06:32 2003 UTC (8 years, 10 months ago) by itojun
Branch: MAIN
CVS Tags: netbsd-2-base, netbsd-2-1-RELEASE, netbsd-2-1-RC6, netbsd-2-1-RC5, netbsd-2-1-RC4, netbsd-2-1-RC3, netbsd-2-1-RC2, netbsd-2-1-RC1, netbsd-2-1, netbsd-2-0-base, netbsd-2-0-RELEASE, netbsd-2-0-RC5, netbsd-2-0-RC4, netbsd-2-0-RC3, netbsd-2-0-RC2, netbsd-2-0-RC1, netbsd-2-0-3-RELEASE, netbsd-2-0-2-RELEASE, netbsd-2-0-1-RELEASE, netbsd-2-0, netbsd-2
Changes since 1.17: +7 -9 lines
Diff to previous 1.17 (colored)

function prototype must not have variable name

Revision 1.14.4.3 / (download) - annotate - [select for diffs], Fri Sep 6 08:45:51 2002 UTC (9 years, 8 months ago) by jdolecek
Branch: kqueue
Changes since 1.14.4.2: +6 -2 lines
Diff to previous 1.14.4.2 (colored) to branchpoint 1.14 (colored) next main 1.15 (colored)

sync kqueue branch with HEAD

Revision 1.15.8.2 / (download) - annotate - [select for diffs], Thu Aug 29 05:22:47 2002 UTC (9 years, 8 months ago) by gehenna
Branch: gehenna-devsw
Changes since 1.15.8.1: +6 -2 lines
Diff to previous 1.15.8.1 (colored) to branchpoint 1.15 (colored) next main 1.16 (colored)

catch up with -current.

Revision 1.14.2.3 / (download) - annotate - [select for diffs], Tue Aug 27 23:46:58 2002 UTC (9 years, 9 months ago) by nathanw
Branch: nathanw_sa
CVS Tags: nathanw_sa_end
Changes since 1.14.2.2: +6 -2 lines
Diff to previous 1.14.2.2 (colored) to branchpoint 1.14 (colored) next main 1.15 (colored)

Catch up to -current.

Revision 1.17 / (download) - annotate - [select for diffs], Thu Aug 15 10:37:02 2002 UTC (9 years, 9 months ago) by christos
Branch: MAIN
CVS Tags: nathanw_sa_before_merge, nathanw_sa_base, kqueue-beforemerge, kqueue-base, kqueue-aftermerge, gmcgarry_ucred_base, gmcgarry_ucred, gmcgarry_ctxsw_base, gmcgarry_ctxsw, gehenna-devsw-base, fvdl_fs64_base
Branch point for: ktrace-lwp
Changes since 1.16: +6 -2 lines
Diff to previous 1.16 (colored)

Fix multi-function card memory problems:
- centralize pcmcia function allocation and free'ing.
- free the cfe too, not just the pf in the multifunction card case.
- don't free pointers while walking the list, because free() will
  fill the memory with deadbeef, thus killing list walking.

Revision 1.14.4.2 / (download) - annotate - [select for diffs], Sun Jun 23 17:48:25 2002 UTC (9 years, 11 months ago) by jdolecek
Branch: kqueue
Changes since 1.14.4.1: +3 -3 lines
Diff to previous 1.14.4.1 (colored) to branchpoint 1.14 (colored)

catch up with -current on kqueue branch

Revision 1.15.8.1 / (download) - annotate - [select for diffs], Thu Jun 20 16:34:03 2002 UTC (9 years, 11 months ago) by gehenna
Branch: gehenna-devsw
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)

catch up with -current.

Revision 1.14.2.2 / (download) - annotate - [select for diffs], Thu Jun 20 03:46:18 2002 UTC (9 years, 11 months ago) by nathanw
Branch: nathanw_sa
Changes since 1.14.2.1: +3 -3 lines
Diff to previous 1.14.2.1 (colored) to branchpoint 1.14 (colored)

Catch up to -current.

Revision 1.16 / (download) - annotate - [select for diffs], Sat Jun 1 23:51:02 2002 UTC (9 years, 11 months ago) by lukem
Branch: MAIN
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)

SIMPLEQ rototill:
- implement SIMPLEQ_REMOVE(head, elm, type, field).  whilst it's O(n),
  this mirrors the functionality of SLIST_REMOVE() (the other
  singly-linked list type) and FreeBSD's STAILQ_REMOVE()
- remove the unnecessary elm arg from SIMPLEQ_REMOVE_HEAD().
  this mirrors the functionality of SLIST_REMOVE_HEAD() (the other
  singly-linked list type) and FreeBSD's STAILQ_REMOVE_HEAD()
- remove notes about SIMPLEQ not supporting arbitrary element removal
- use SIMPLEQ_FOREACH() instead of home-grown for loops
- use SIMPLEQ_EMPTY() appropriately
- use SIMPLEQ_*() instead of accessing sqh_first,sqh_last,sqe_next directly
- reorder manual page; be consistent about how the types are listed
- other minor cleanups

Revision 1.14.4.1 / (download) - annotate - [select for diffs], Thu Jan 10 19:57:28 2002 UTC (10 years, 4 months ago) by thorpej
Branch: kqueue
Changes since 1.14: +3 -5 lines
Diff to previous 1.14 (colored)

Sync kqueue branch with -current.

Revision 1.14.2.1 / (download) - annotate - [select for diffs], Tue Jan 8 00:31:30 2002 UTC (10 years, 4 months ago) by nathanw
Branch: nathanw_sa
Changes since 1.14: +3 -5 lines
Diff to previous 1.14 (colored)

Catch up to -current.

Revision 1.15 / (download) - annotate - [select for diffs], Sat Dec 15 13:23:23 2001 UTC (10 years, 5 months ago) by soren
Branch: MAIN
CVS Tags: newlock-base, newlock, netbsd-1-6-base, netbsd-1-6-RELEASE, netbsd-1-6-RC3, netbsd-1-6-RC2, netbsd-1-6-RC1, netbsd-1-6-PATCH001-RELEASE, netbsd-1-6-PATCH001-RC3, netbsd-1-6-PATCH001-RC2, netbsd-1-6-PATCH001-RC1, netbsd-1-6-PATCH001, ifpoll-base, ifpoll, eeh-devprop-base, eeh-devprop
Branch point for: netbsd-1-6, gehenna-devsw
Changes since 1.14: +3 -5 lines
Diff to previous 1.14 (colored)

To make dev/pcmcia work on platforms with 64-bit bus_addr_t and
32-bit bus_size_t (sparc), change the pcmcia_mem_map(9) offsetp
argument to bus_size_t as it is used as a bus_space offset.

Revision 1.9.8.2 / (download) - annotate - [select for diffs], Sun Feb 11 19:16:14 2001 UTC (11 years, 3 months ago) by bouyer
Branch: thorpej_scsipi
Changes since 1.9.8.1: +4 -4 lines
Diff to previous 1.9.8.1 (colored) to branchpoint 1.9 (colored) next main 1.10 (colored)

Sync with HEAD.

Revision 1.14 / (download) - annotate - [select for diffs], Thu Jan 18 20:28:26 2001 UTC (11 years, 4 months ago) by jdolecek
Branch: MAIN
CVS Tags: thorpej_scsipi_nbase, thorpej_scsipi_beforemerge, thorpej_scsipi_base, thorpej-mips-cache-base, thorpej-mips-cache, thorpej-devvp-base3, thorpej-devvp-base2, thorpej-devvp-base, thorpej-devvp, pre-chs-ubcperf, post-chs-ubcperf
Branch point for: nathanw_sa, kqueue
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

constify

Revision 1.9.8.1 / (download) - annotate - [select for diffs], Mon Nov 20 11:42:48 2000 UTC (11 years, 6 months ago) by bouyer
Branch: thorpej_scsipi
Changes since 1.9: +40 -1 lines
Diff to previous 1.9 (colored)

Update thorpej_scsipi to -current as of a month ago
A i386 GENERIC kernel compiles without the siop, ahc and bha drivers
(will be updated later). i386 IDE/ATAPI and ncr work, as well as
sparc/esp_sbus. alpha should work as well (untested yet).
siop, ahc and bha will be updated once I've updated the branch to current
-current, as well as machine-dependant code.

Revision 1.13 / (download) - annotate - [select for diffs], Tue Oct 17 10:13:47 2000 UTC (11 years, 7 months ago) by haya
Branch: MAIN
Changes since 1.12: +22 -1 lines
Diff to previous 1.12 (colored)

Add a cis decoding function which decodes some CISTPL_FUNCE tuples for
disk and network functions.

Revision 1.12 / (download) - annotate - [select for diffs], Tue Feb 8 12:51:31 2000 UTC (12 years, 3 months ago) by enami
Branch: MAIN
CVS Tags: netbsd-1-5-base, netbsd-1-5-RELEASE, netbsd-1-5-PATCH003, netbsd-1-5-PATCH002, netbsd-1-5-PATCH001, netbsd-1-5-BETA2, netbsd-1-5-BETA, netbsd-1-5-ALPHA2, netbsd-1-5, minoura-xpg4dl-base, minoura-xpg4dl, chs-ubc2-newbase
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

- Don't rely on implicit declaration.
- Sinc wi/ existing coding style.

Revision 1.11 / (download) - annotate - [select for diffs], Mon Feb 7 09:35:29 2000 UTC (12 years, 3 months ago) by augustss
Branch: MAIN
Changes since 1.10: +4 -1 lines
Diff to previous 1.10 (colored)

Add a pcmcia_devinfo() function (akin to pci_devinfo).  It generates a
string suitable for printing in the attach message.

Revision 1.10 / (download) - annotate - [select for diffs], Fri Feb 4 01:27:14 2000 UTC (12 years, 3 months ago) by cgd
Branch: MAIN
Changes since 1.9: +16 -1 lines
Diff to previous 1.9 (colored)

replace the *_lookup table entry match/lookup functions in all of
these drivers with a single common function (which supports tables
of variable-sized structures).  Things are mostly as they were before:
tables are terminated by entry with NULL name, etc.  There's also
the ability to call a driver-specific match function which can be used
to augment the table lookup.

Revision 1.9 / (download) - annotate - [select for diffs], Tue Dec 29 09:00:28 1998 UTC (13 years, 4 months ago) by marc
Branch: MAIN
CVS Tags: wrstuden-devbsize-base, wrstuden-devbsize-19991221, wrstuden-devbsize, netbsd-1-4-base, netbsd-1-4-RELEASE, netbsd-1-4-PATCH003, netbsd-1-4-PATCH002, netbsd-1-4-PATCH001, netbsd-1-4, kame_14_19990705, kame_14_19990628, kame_141_19991130, kame, fvdl-softdep-base, fvdl-softdep, comdex-fall-1999-base, comdex-fall-1999, chs-ubc2-base, chs-ubc2
Branch point for: thorpej_scsipi
Changes since 1.8: +2 -1 lines
Diff to previous 1.8 (colored)

added support for quirks based on cis strings, added quirk entry for SVEC_LANCARD

Revision 1.8 / (download) - annotate - [select for diffs], Thu Dec 24 04:51:59 1998 UTC (13 years, 5 months ago) by marc
Branch: MAIN
Changes since 1.7: +11 -1 lines
Diff to previous 1.7 (colored)

add quirk support for cards which lie extensively about their CIS

Revision 1.7 / (download) - annotate - [select for diffs], Tue Nov 17 08:49:13 1998 UTC (13 years, 6 months ago) by thorpej
Branch: MAIN
CVS Tags: kenh-if-detach-base, kenh-if-detach
Changes since 1.6: +3 -1 lines
Diff to previous 1.6 (colored)

Finish implementing interrupt-driven card insertion and removal support.

- Deactivate the card on removal and queue a REMOVAL event for the socket's
event thread to finish the detach.
- Queue an INSERTION event for the socket's event thread on insertion.

Implement a few missing infrastructure pieces to support this.

Hot swapping of PCMCIA cards now "works".  (Not quite; things like network
devices need changes for their respestive subsystems.  These changes are
coming soon...)

Revision 1.6 / (download) - annotate - [select for diffs], Sat Oct 10 21:59:40 1998 UTC (13 years, 7 months ago) by thorpej
Branch: MAIN
CVS Tags: chs-ubc-base, chs-ubc
Changes since 1.5: +4 -1 lines
Diff to previous 1.5 (colored)

Define missing pcmcia_io_free().

Revision 1.5 / (download) - annotate - [select for diffs], Sun Jul 19 17:28:17 1998 UTC (13 years, 10 months ago) by christos
Branch: MAIN
CVS Tags: eeh-paddr_t-base, eeh-paddr_t
Changes since 1.4: +3 -2 lines
Diff to previous 1.4 (colored)

Add a devlist2h.awk so that we don't sprinkle the same constants over
each device driver file and use it.

Revision 1.4 / (download) - annotate - [select for diffs], Sun Feb 1 23:38:06 1998 UTC (14 years, 3 months ago) by marc
Branch: MAIN
Changes since 1.3: +3 -1 lines
Diff to previous 1.3 (colored)

add state to struct pcmcia_function for mfc iobase/iosize support

Revision 1.3 / (download) - annotate - [select for diffs], Sun Oct 19 14:00:42 1997 UTC (14 years, 7 months ago) by enami
Branch: MAIN
CVS Tags: netbsd-1-3-base, netbsd-1-3-RELEASE, netbsd-1-3-PATCH003-CANDIDATE2, netbsd-1-3-PATCH003-CANDIDATE1, netbsd-1-3-PATCH003-CANDIDATE0, netbsd-1-3-PATCH003, netbsd-1-3-PATCH002, netbsd-1-3-PATCH001, netbsd-1-3-BETA, netbsd-1-3
Changes since 1.2: +12 -5 lines
Diff to previous 1.2 (colored)

Make `manufacturer' and `product' 32bit wide so that they can contain
both 16bit id values found in card CIS and special value to indicate
that no value found in CIS.  Use that special value for the card that
doesn't have id values.  Test that value in ne2000_match().

Revision 1.2 / (download) - annotate - [select for diffs], Thu Oct 16 23:27:40 1997 UTC (14 years, 7 months ago) by thorpej
Branch: MAIN
Changes since 1.1: +252 -0 lines
Diff to previous 1.1 (colored)

Pull marc-pcmcia branch down from trunk.

Revision 1.1.2.8 / (download) - annotate - [select for diffs], Thu Oct 16 22:43:54 1997 UTC (14 years, 7 months ago) by thorpej
Branch: marc-pcmcia
Changes since 1.1.2.7: +30 -1 lines
Diff to previous 1.1.2.7 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

Copyright/license update.

Revision 1.1.2.7 / (download) - annotate - [select for diffs], Thu Oct 16 19:42:05 1997 UTC (14 years, 7 months ago) by thorpej
Branch: marc-pcmcia
Changes since 1.1.2.6: +9 -1 lines
Diff to previous 1.1.2.6 (colored) to branchpoint 1.1 (colored)

Pass down the start and side of the i/o space allocation range to
the "pcmcia" layer so that drivers with Very Special i/o space allocation
needs can know what range they should be dealing with.

Revision 1.1.2.6 / (download) - annotate - [select for diffs], Tue Oct 14 04:56:41 1997 UTC (14 years, 7 months ago) by thorpej
Branch: marc-pcmcia
Changes since 1.1.2.5: +139 -123 lines
Diff to previous 1.1.2.5 (colored) to branchpoint 1.1 (colored)

KNF, RCS IDs.

Revision 1.1.2.5 / (download) - annotate - [select for diffs], Tue Oct 14 00:42:56 1997 UTC (14 years, 7 months ago) by thorpej
Branch: marc-pcmcia
Changes since 1.1.2.4: +2 -2 lines
Diff to previous 1.1.2.4 (colored) to branchpoint 1.1 (colored)

Allow the i/o address alignment to be specified in the call to
pcmcia_io_alloc().  If the caller does not care about the alignment, 0
should be passed.

Revision 1.1.2.4 / (download) - annotate - [select for diffs], Sat Aug 23 01:48:29 1997 UTC (14 years, 9 months ago) by thorpej
Branch: marc-pcmcia
Changes since 1.1.2.3: +9 -3 lines
Diff to previous 1.1.2.3 (colored) to branchpoint 1.1 (colored)

Split up pcmcia_enable_function() into pcmcia_function_init() and
pcmcia_function_enable().  Implement pcmcia_function_disable().
If the enabled count on a socket reaches 0, call the chipset-level
socket disable function.  If the enabled count becomes non-0, call
the chipset-level socket enable function.

Revision 1.1.2.3 / (download) - annotate - [select for diffs], Sun Aug 10 22:47:54 1997 UTC (14 years, 9 months ago) by thorpej
Branch: marc-pcmcia
Changes since 1.1.2.2: +44 -23 lines
Diff to previous 1.1.2.2 (colored) to branchpoint 1.1 (colored)

Create a structure to encapsulate information about allocated i/o and
mem space on the pcmcia bus.  Use this in chip-level window enable
functions rather than making assumptions about the bus space handles.

Also, clean up lots of debugging prints.  Use patchables to enable them.

Revision 1.1.2.2 / (download) - annotate - [select for diffs], Wed Jul 30 07:39:03 1997 UTC (14 years, 9 months ago) by marc
Branch: marc-pcmcia
Changes since 1.1.2.1: +0 -0 lines
Diff to previous 1.1.2.1 (colored) to branchpoint 1.1 (colored)

add the pcmcia device dir.

Revision 1.1.2.1 / (download) - annotate - [select for diffs], Wed Jul 30 07:30:32 1997 UTC (14 years, 9 months ago) by marc
Branch: marc-pcmcia
Changes since 1.1: +172 -0 lines
Diff to previous 1.1 (colored)

added pcmcia infrastructure and a few devices

Revision 1.1, Wed Jul 30 07:30:31 1997 UTC (14 years, 9 months ago) by marc
Branch: MAIN
CVS Tags: thorpej-signal-base, thorpej-signal, marc-pcmcia-base
Branch point for: marc-pcmcia
FILE REMOVED

file pcmciavar.h was initially added on branch marc-pcmcia.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>