CVS log for src/sys/dev/cardbus/njata_cardbus.c

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

Request diff between arbitrary revisions

Default branch: MAIN

remove some bloat:
-cardbus doesn't use multiple interrupt lines like PCI, and it doesn't
 use machanisms like interrupt line register and swizzling -- no need
 to carry around dummy information, this is all dealt with by the
 bridge
 (I'm asking myself how "rbus_ppb" can work -- a bridge attached to
 cardbus just can't work like a normal PCI bridge as far as interrupts
 are concerned. I thing that should be a hardware specific driver
 because behavior is not covered by a standard.)
-cardbus always uses 3.3V -- no need for a variable to keep track
 of the voltage

Revision 1.13.4.1 / (download) - annotate - [select for diffs], Mon Jun 6 09:07:46 2011 UTC (11 months, 2 weeks ago) by jruoho
Branch: jruoho-x86intr
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored) next main 1.14 (colored)

Sync with HEAD.

Revision 1.13.2.1 / (download) - annotate - [select for diffs], Sat Mar 5 20:53:06 2011 UTC (14 months, 3 weeks ago) by rmind
Branch: rmind-uvmplock
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored) next main 1.14 (colored)

sync with head

Revision 1.13.6.1 / (download) - annotate - [select for diffs], Sat Mar 5 15:10:17 2011 UTC (14 months, 3 weeks ago) by bouyer
Branch: bouyer-quota2
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored) next main 1.14 (colored)

Sync with HEAD

Revision 1.14 / (download) - annotate - [select for diffs], Mon Feb 21 02:31:59 2011 UTC (15 months ago) by itohy
Branch: MAIN
CVS Tags: rmind-uvmplock-nbase, rmind-uvmplock-base, cherry-xenmp-base, cherry-xenmp, bouyer-quota2-nbase
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

Cleanup my copyright notice.

Revision 1.6.4.4 / (download) - annotate - [select for diffs], Wed Aug 11 22:53:20 2010 UTC (21 months, 2 weeks ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.6.4.3: +4 -7 lines
Diff to previous 1.6.4.3 (colored) to branchpoint 1.6 (colored) next main 1.7 (colored)

sync with head.

Revision 1.8.2.1 / (download) - annotate - [select for diffs], Fri Apr 30 14:43:10 2010 UTC (2 years ago) by uebayasi
Branch: uebayasi-xip
Changes since 1.8: +18 -28 lines
Diff to previous 1.8 (colored) next main 1.9 (colored)

Sync with HEAD.

Revision 1.13 / (download) - annotate - [select for diffs], Thu Mar 11 17:27:40 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
CVS Tags: yamt-nfs-mp-base11, yamt-nfs-mp-base10, uebayasi-xip-base4, uebayasi-xip-base3, uebayasi-xip-base2, uebayasi-xip-base1, matt-mips64-premerge-20101231, jruoho-x86intr-base, bouyer-quota2-base
Branch point for: rmind-uvmplock, jruoho-x86intr, bouyer-quota2
Changes since 1.12: +4 -7 lines
Diff to previous 1.12 (colored)

Simplify interrupt (dis)establishment by two source transformations:

-       cardbus_intr_disestablish(cc, cf, ih);
+       Cardbus_intr_disestablish(ct, ih);

-       ih = cardbus_intr_establish(cc, cf, ...);
+       ih = Cardbus_intr_establish(ct, ...);

Tested by ITOH Yasufumi.  Results: njs(4) works, njata(4) hangs.
njata(4) also hangs in 5.0.1 and in 5.99.24 prior to this patch, so
there is no regression.

Revision 1.6.4.3 / (download) - annotate - [select for diffs], Thu Mar 11 15:03:25 2010 UTC (2 years, 2 months ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.6.4.2: +16 -23 lines
Diff to previous 1.6.4.2 (colored) to branchpoint 1.6 (colored)

sync with head

Revision 1.12 / (download) - annotate - [select for diffs], Fri Feb 26 00:57:02 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
CVS Tags: yamt-nfs-mp-base9
Changes since 1.11: +13 -13 lines
Diff to previous 1.11 (colored)

Use PCI_ constants and macros instead of CARDBUS_.  Use
Cardbus_conf_{read,write}() instead of cardbus_conf_{read,write}().
Delete all of the CARDBUS_ constants and macros that replicate PCI_.

Compile-tested, only.

Revision 1.11 / (download) - annotate - [select for diffs], Thu Feb 25 23:40:39 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
Changes since 1.10: +2 -7 lines
Diff to previous 1.10 (colored)

Make fxp at cardbus detach during shutdown.

Stop calling (*cardbus_ctrl) to enable bus mastering, I/O and memory
spaces on the CardBus bridge.  cbb(4) always enables that stuff,
anyway.  In the process, avoid remembering what BAR we mapped by
writing CARDBUS_{IO,MEM}_ENABLE to sc_cben or sc_cbenable, and
record the BAR in use sc_bar, instead.

Replace more CARDBUS_ constants with PCI_ constants.

Compile-tested, only.

Revision 1.10 / (download) - annotate - [select for diffs], Thu Feb 25 21:18:35 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 (colored)

Phase out some CardBus constants and types.  Use the equivalent PCI
constants and types, instead:

        CARDBUS_CLASS_REG -> PCI_CLASS_REG
        CARDBUS_ID_REG -> PCI_ID_REG
        cardbus_product_id_t -> pci_product_id_t
        cardbus_vendor_id_t -> pci_vendor_id_t

Revision 1.9 / (download) - annotate - [select for diffs], Wed Feb 24 19:52:52 2010 UTC (2 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.8: +3 -5 lines
Diff to previous 1.8 (colored)

Start to tuck Cardbus under the PCI abstraction.  Step #1, textual
substitution: for all practical purposes, pcitag_t and cardbustag_t
are interchangeable, so just use pcitag_t.  Ditto pcireg_t and
cardbusreg_t.

While I'm here, don't make a copy (sc_intrline) of
cardbus_attach_args.ca_intrline unless we use it, later.

Revision 1.6.4.2 / (download) - annotate - [select for diffs], Sat May 16 10:41:19 2009 UTC (3 years ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.6.4.1: +3 -3 lines
Diff to previous 1.6.4.1 (colored) to branchpoint 1.6 (colored)

sync with head

Revision 1.7.10.1 / (download) - annotate - [select for diffs], Wed May 13 17:19:16 2009 UTC (3 years ago) by jym
Branch: jym-xensuspend
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored) next main 1.8 (colored)

Sync with HEAD.

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

Revision 1.8 / (download) - annotate - [select for diffs], Tue May 12 14:17:31 2009 UTC (3 years ago) by cegger
Branch: MAIN
CVS Tags: yamt-nfs-mp-base8, yamt-nfs-mp-base7, yamt-nfs-mp-base6, yamt-nfs-mp-base5, yamt-nfs-mp-base4, uebayasi-xip-base, matt-premerge-20091211, jymxensuspend-base, jym-xensuspend-nbase, jym-xensuspend-base
Branch point for: uebayasi-xip
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)

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

Revision 1.6.4.1 / (download) - annotate - [select for diffs], Mon May 4 08:12:36 2009 UTC (3 years ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.6: +5 -7 lines
Diff to previous 1.6 (colored)

sync with head.

Revision 1.6.6.1 / (download) - annotate - [select for diffs], Thu Sep 18 04:35:02 2008 UTC (3 years, 8 months ago) by wrstuden
Branch: wrstuden-revivesa
Changes since 1.6: +5 -7 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

Sync with wrstuden-revivesa-base-2.

Revision 1.5.16.2 / (download) - annotate - [select for diffs], Sun Jun 29 09:33:05 2008 UTC (3 years, 10 months ago) by mjf
Branch: mjf-devfs2
Changes since 1.5.16.1: +3 -5 lines
Diff to previous 1.5.16.1 (colored) to branchpoint 1.5 (colored) next main 1.6 (colored)

Sync with HEAD.

Revision 1.6.8.1 / (download) - annotate - [select for diffs], Fri Jun 27 15:11:21 2008 UTC (3 years, 10 months ago) by simonb
Branch: simonb-wapbl
Changes since 1.6: +5 -7 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

Sync with head.

Revision 1.7 / (download) - annotate - [select for diffs], Tue Jun 24 19:44:52 2008 UTC (3 years, 11 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.6: +5 -7 lines
Diff to previous 1.6 (colored)

clean up the cardbus interrupt stuff:
There were cardbus_intr_line_t and cardbus_intr_handle_t used intermixed
for the same variable, and that variable is pretty much useless because
cardbus doesn't follow the PCI interrupt swizzling etc scheme.
Useless interrupt numbers were printed on cardbus device attach.
So as a first step to sanity, kill cardbus_intr_handle_t and poison
cardbus_intr_line_t to discourage printing it as a %d.
Use cardbus_intr_line_t consistently throughout the code.
Remove the "interrupting at foo" messages because the information
is misleading. We could come up with a better interrupt vector
information, but because cardbus interrupts are mediated by pccbb
it would still be misleading.

Revision 1.5.16.1 / (download) - annotate - [select for diffs], Thu Apr 3 12:42:39 2008 UTC (4 years, 1 month ago) by mjf
Branch: mjf-devfs2
Changes since 1.5: +19 -24 lines
Diff to previous 1.5 (colored)

Sync with HEAD.

Revision 1.3.4.5 / (download) - annotate - [select for diffs], Mon Mar 24 09:38:49 2008 UTC (4 years, 2 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.3.4.4: +19 -24 lines
Diff to previous 1.3.4.4 (colored) to branchpoint 1.3 (colored) next main 1.4 (colored)

sync with head.

Revision 1.5.12.1 / (download) - annotate - [select for diffs], Mon Mar 24 07:15:15 2008 UTC (4 years, 2 months ago) by keiichi
Branch: keiichi-mipv6
Changes since 1.5: +19 -24 lines
Diff to previous 1.5 (colored) next main 1.6 (colored)

sync with head.

Revision 1.4.20.2 / (download) - annotate - [select for diffs], Sun Mar 23 02:04:36 2008 UTC (4 years, 2 months ago) by matt
Branch: matt-armv6
Changes since 1.4.20.1: +19 -24 lines
Diff to previous 1.4.20.1 (colored) to branchpoint 1.4 (colored) next main 1.5 (colored)

sync with HEAD

Revision 1.6 / (download) - annotate - [select for diffs], Tue Mar 18 20:46:36 2008 UTC (4 years, 2 months ago) by cube
Branch: MAIN
CVS Tags: yamt-pf42-baseX, yamt-pf42-base4, yamt-pf42-base3, yamt-pf42-base2, yamt-pf42-base, yamt-pf42, yamt-nfs-mp-base2, yamt-nfs-mp-base, yamt-lazymbuf-base15, yamt-lazymbuf-base14, wrstuden-revivesa-base-1, wrstuden-revivesa-base, matt-armv6-nbase, keiichi-mipv6-nbase, keiichi-mipv6-base, hpcarm-cleanup-nbase, ad-socklock-base1
Branch point for: yamt-nfs-mp, wrstuden-revivesa, simonb-wapbl
Changes since 1.5: +19 -24 lines
Diff to previous 1.5 (colored)

Split device_t and softc for ATA devices, as well as wd(4).  Other
cosmetic changes where appropriate.

Revision 1.4.20.1 / (download) - annotate - [select for diffs], Tue Nov 6 23:25:54 2007 UTC (4 years, 6 months ago) by matt
Branch: matt-armv6
CVS Tags: matt-armv6-prevmlocking
Changes since 1.4: +4 -4 lines
Diff to previous 1.4 (colored)

sync with HEAD

Revision 1.3.4.4 / (download) - annotate - [select for diffs], Sat Oct 27 11:30:11 2007 UTC (4 years, 6 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.3.4.3: +4 -4 lines
Diff to previous 1.3.4.3 (colored) to branchpoint 1.3 (colored)

sync with head.

Revision 1.4.18.1 / (download) - annotate - [select for diffs], Fri Oct 26 15:44:21 2007 UTC (4 years, 7 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.4: +4 -4 lines
Diff to previous 1.4 (colored) next main 1.5 (colored)

Sync with HEAD.

Follow the merge of pmap.c on i386 and amd64 and move
pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup
code to restore CR4 before jumping back into kernel space as the large
page option might cover that.

Revision 1.4.24.1 / (download) - annotate - [select for diffs], Thu Oct 25 22:37:15 2007 UTC (4 years, 7 months ago) by bouyer
Branch: bouyer-xenamd64
Changes since 1.4: +4 -4 lines
Diff to previous 1.4 (colored) next main 1.5 (colored)

Sync with HEAD.

Revision 1.4.6.1 / (download) - annotate - [select for diffs], Tue Oct 23 20:06:59 2007 UTC (4 years, 7 months ago) by ad
Branch: vmlocking
Changes since 1.4: +4 -4 lines
Diff to previous 1.4 (colored) next main 1.5 (colored)

Sync with head.

Revision 1.5 / (download) - annotate - [select for diffs], Fri Oct 19 11:59:39 2007 UTC (4 years, 7 months ago) by ad
Branch: MAIN
CVS Tags: yamt-kmem-base3, yamt-kmem-base2, yamt-kmem-base, yamt-kmem, vmlocking2-base3, vmlocking2-base2, vmlocking2-base1, vmlocking2, vmlocking-nbase, reinoud-bufcleanup-nbase, reinoud-bufcleanup-base, nick-net80211-sync-base, nick-net80211-sync, mjf-devfs-base, mjf-devfs, matt-armv6-base, jmcneill-pm-base, jmcneill-base, hpcarm-cleanup-base, cube-autoconf-base, cube-autoconf, bouyer-xeni386-nbase, bouyer-xeni386-merge1, bouyer-xeni386-base, bouyer-xeni386, bouyer-xenamd64-base2, bouyer-xenamd64-base
Branch point for: mjf-devfs2, keiichi-mipv6
Changes since 1.4: +4 -4 lines
Diff to previous 1.4 (colored)

machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h

Revision 1.3.4.3 / (download) - annotate - [select for diffs], Mon Feb 26 09:10:00 2007 UTC (5 years, 2 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.3.4.2: +4 -2 lines
Diff to previous 1.3.4.2 (colored) to branchpoint 1.3 (colored)

sync with head.

Revision 1.1.2.2 / (download) - annotate - [select for diffs], Fri Jan 12 00:57:34 2007 UTC (5 years, 4 months ago) by ad
Branch: newlock2
Changes since 1.1.2.1: +4 -2 lines
Diff to previous 1.1.2.1 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

Sync with head.

Revision 1.4 / (download) - annotate - [select for diffs], Sun Dec 31 12:50:19 2006 UTC (5 years, 4 months ago) by ichiro
Branch: MAIN
CVS Tags: yamt-x86pmap-base4, yamt-x86pmap-base3, yamt-x86pmap-base2, yamt-x86pmap-base, yamt-x86pmap, yamt-idlelwp-base8, yamt-idlelwp, vmlocking-base, thorpej-atomic-base, thorpej-atomic, reinoud-bufcleanup, post-newlock2-merge, nick-csl-alignment-base5, nick-csl-alignment-base, nick-csl-alignment, newlock2-nbase, newlock2-base, mjf-ufs-trans-base, mjf-ufs-trans, matt-mips64-base, matt-mips64, hpcarm-cleanup, ad-audiomp-base, ad-audiomp
Branch point for: vmlocking, matt-armv6, jmcneill-pm, bouyer-xenamd64
Changes since 1.3: +4 -2 lines
Diff to previous 1.3 (colored)

add entry CF32A CF Adapter (BUFFALO RCF-CBA2)

Revision 1.3.4.2 / (download) - annotate - [select for diffs], Sat Dec 30 20:47:57 2006 UTC (5 years, 4 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.3.4.1: +261 -0 lines
Diff to previous 1.3.4.1 (colored) to branchpoint 1.3 (colored)

sync with head.

Revision 1.1.8.2 / (download) - annotate - [select for diffs], Sun Dec 10 07:16:58 2006 UTC (5 years, 5 months ago) by yamt
Branch: yamt-splraiseipl
Changes since 1.1.8.1: +5 -5 lines
Diff to previous 1.1.8.1 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

sync with head.

Revision 1.1.2.1 / (download) - annotate - [select for diffs], Sat Nov 18 21:34:04 2006 UTC (5 years, 6 months ago) by ad
Branch: newlock2
Changes since 1.1: +6 -9 lines
Diff to previous 1.1 (colored)

Sync with head.

Revision 1.3.4.1, Thu Nov 16 01:32:48 2006 UTC (5 years, 6 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.3: +0 -261 lines
FILE REMOVED

file njata_cardbus.c was added on branch yamt-lazymbuf on 2006-12-30 20:47:57 +0000

Revision 1.3 / (download) - annotate - [select for diffs], Thu Nov 16 01:32:48 2006 UTC (5 years, 6 months ago) by christos
Branch: MAIN
CVS Tags: yamt-splraiseipl-base5, yamt-splraiseipl-base4, yamt-splraiseipl-base3, wrstuden-fixsa-newbase, wrstuden-fixsa-base-1, wrstuden-fixsa-base, wrstuden-fixsa, 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, matt-nb4-arm-base, matt-nb4-arm
Branch point for: yamt-lazymbuf
Changes since 1.2: +5 -5 lines
Diff to previous 1.2 (colored)

__unused removal on arguments; approved by core.

Revision 1.1.8.1 / (download) - annotate - [select for diffs], Sun Oct 22 06:05:35 2006 UTC (5 years, 7 months ago) by yamt
Branch: yamt-splraiseipl
Changes since 1.1: +6 -9 lines
Diff to previous 1.1 (colored)

sync with head

Revision 1.2 / (download) - annotate - [select for diffs], Thu Oct 12 01:30:57 2006 UTC (5 years, 7 months ago) by christos
Branch: MAIN
CVS Tags: yamt-splraiseipl-base2
Changes since 1.1: +6 -9 lines
Diff to previous 1.1 (colored)

- sprinkle __unused on function decls.
- fix a couple of unused bugs
- no more -Wno-unused for i386

Revision 1.1.6.2 / (download) - annotate - [select for diffs], Thu Sep 14 12:31:27 2006 UTC (5 years, 8 months ago) by yamt
Branch: yamt-pdpolicy
Changes since 1.1.6.1: +264 -0 lines
Diff to previous 1.1.6.1 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

sync with head.

Revision 1.1.4.2 / (download) - annotate - [select for diffs], Sat Sep 9 02:49:44 2006 UTC (5 years, 8 months ago) by rpaulo
Branch: rpaulo-netinet-merge-pcb
Changes since 1.1.4.1: +264 -0 lines
Diff to previous 1.1.4.1 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

sync with head

Revision 1.1.6.1, Thu Sep 7 14:22:07 2006 UTC (5 years, 8 months ago) by yamt
Branch: yamt-pdpolicy
Changes since 1.1: +0 -264 lines
FILE REMOVED

file njata_cardbus.c was added on branch yamt-pdpolicy on 2006-09-14 12:31:27 +0000

Revision 1.1.4.1, Thu Sep 7 14:22:07 2006 UTC (5 years, 8 months ago) by rpaulo
Branch: rpaulo-netinet-merge-pcb
Changes since 1.1: +0 -264 lines
FILE REMOVED

file njata_cardbus.c was added on branch rpaulo-netinet-merge-pcb on 2006-09-09 02:49:44 +0000

Revision 1.1 / (download) - annotate - [select for diffs], Thu Sep 7 14:22:07 2006 UTC (5 years, 8 months ago) by itohy
Branch: MAIN
CVS Tags: yamt-splraiseipl-base, yamt-pdpolicy-base9, rpaulo-netinet-merge-pcb-base
Branch point for: yamt-splraiseipl, yamt-pdpolicy, rpaulo-netinet-merge-pcb, newlock2

Workbit NinjaATA-32 busmastering PIO IDE controller driver (njata)

This driver supports NinjaATA-32Bi and NPATA-32 chips,
which are used for CardBus ATA interface cards and
CardBus CompactFlash adapters.

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.

Diffs between
and

Preferred Diff type:
View only Branch:
Sort log by:

CVSweb <webmaster@jp.NetBSD.org>