PERFORCE change 115117 for review
Paolo Pisati
piso at FreeBSD.org
Tue Feb 27 13:15:50 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=115117
Change 115117 by piso at piso_newluxor on 2007/02/27 13:15:32
Reduce diff against HEAD.
Affected files ...
.. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#7 edit
.. //depot/projects/soc2006/intr_filter/sys/bus.h#8 edit
Differences ...
==== //depot/projects/soc2006/intr_filter/i386/conf/NOTES#7 (text+ko) ====
@@ -7,8 +7,6 @@
# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1238 2006/10/31 07:22:24 takawata Exp $
#
-ident NOTES
-
#
# We want LINT to cover profiling as well.
profile 2
@@ -313,6 +311,8 @@
# (default 9600).
device speaker #Play IBM BASIC-style noises out your speaker
+hint.speaker.0.at="isa"
+hint.speaker.0.port="0x61"
device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT!
device apm_saver # Requires APM
@@ -404,6 +404,8 @@
#
# The Numeric Processing eXtension driver. This is non-optional.
device npx
+hint.npx.0.flags="0x0"
+hint.npx.0.irq="13"
#
# `flags' for npx0:
@@ -562,6 +564,9 @@
# mse: Logitech and ATI InPort bus mouse ports
device mse
+hint.mse.0.at="isa"
+hint.mse.0.port="0x23c"
+hint.mse.0.irq="5"
#
# Network interfaces:
@@ -604,33 +609,70 @@
# Order for ISA/EISA devices is important here
-device miibus
device ar
+hint.ar.0.at="isa"
+hint.ar.0.port="0x300"
+hint.ar.0.irq="10"
+hint.ar.0.maddr="0xd0000"
device arl
+hint.arl.0.at="isa"
+hint.arl.0.irq="9"
+hint.arl.0.maddr="0xd0000"
device ce
device cp
device cs
+hint.cs.0.at="isa"
+hint.cs.0.port="0x300"
device ctau
+hint.ctau.0.at="isa"
+hint.ctau.0.port="0x240"
+hint.ctau.0.irq="15"
+hint.ctau.0.drq="7"
device cx
+hint.cx.0.at="isa"
+hint.cx.0.port="0x240"
+hint.cx.0.irq="15"
+hint.cx.0.drq="7"
#options NETGRAPH_CRONYX # Enable NETGRAPH support for Cronyx adapter(s)
device ed
options ED_3C503
options ED_HPP
options ED_SIC
+hint.ed.0.at="isa"
+hint.ed.0.port="0x280"
+hint.ed.0.irq="5"
+hint.ed.0.maddr="0xd8000"
device ie # Hints only required for Starlan
+hint.ie.2.at="isa"
+hint.ie.2.port="0x300"
+hint.ie.2.irq="5"
+hint.ie.2.maddr="0xd0000"
device iwi
device ipw
# Hint for the i386-only ISA front-end of le(4).
+hint.le.0.at="isa"
+hint.le.0.port="0x280"
+hint.le.0.irq="10"
+hint.le.0.drq="0"
device nfe # nVidia nForce MCP on-board Ethernet Networking
device nve # nVidia nForce MCP on-board Ethernet Networking
device oltr
hint.oltr.0.at="isa"
device ral
device sbni
+hint.sbni.0.at="isa"
+hint.sbni.0.port="0x210"
+hint.sbni.0.irq="0xefdead"
+hint.sbni.0.flags="0"
device sr
+hint.sr.0.at="isa"
+hint.sr.0.port="0x300"
+hint.sr.0.irq="5"
+hint.sr.0.maddr="0xd0000"
device ural
-device oltr
device wl
+hint.wl.0.at="isa"
+hint.wl.0.port="0x300"
options WLCACHE # enables the signal-strength cache
options WLDEBUG # enables verbose debugging output
@@ -670,6 +712,9 @@
device ncv
device nsp
device stg
+hint.stg.0.at="isa"
+hint.stg.0.port="0x140"
+hint.stg.0.port="11"
#
# Adaptec FSA RAID controllers, including integrated DELL controllers,
@@ -743,6 +788,7 @@
# of the Vaio extra features are controlled by this device.
device apm
+hint.apm.0.flags="0x20"
device ipmi
device smapi
device smbios
@@ -750,7 +796,14 @@
device pmtimer # Adjust system timer at wakeup time
device cy
options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared
+hint.cy.0.at="isa"
+hint.cy.0.irq="10"
+hint.cy.0.maddr="0xd4000"
+hint.cy.0.msize="0x2000"
device digi
+hint.digi.0.at="isa"
+hint.digi.0.port="0x104"
+hint.digi.0.maddr="0xd0000"
# BIOS & FEP/OS components of device digi.
device digi_CX
device digi_CX_PCI
@@ -761,7 +814,11 @@
device digi_Xr
# Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
device pbio
+hint.pbio.0.at="isa"
+hint.pbio.0.port="0x360"
device spic
+hint.spic.0.at="isa"
+hint.spic.0.port="0x10a0"
# HOT1 Xilinx 6200 card (http://www.vcc.com/)
device xrpu
@@ -786,6 +843,9 @@
# pcf Philips PCF8584 ISA-bus controller
#
device pcf
+hint.pcf.0.at="isa"
+hint.pcf.0.port="0x320"
+hint.pcf.0.irq="5"
#
# Hardware watchdog timers:
@@ -830,24 +890,53 @@
#
# Teles S0/8 or Niccy 1008
options TEL_S0_8
+hint.isic.0.at="isa"
+hint.isic.0.maddr="0xd0000"
+hint.isic.0.irq="5"
+hint.isic.0.flags="1"
#
# Teles S0/16 or Creatix ISDN-S0 or Niccy 1016
options TEL_S0_16
+hint.isic.0.at="isa"
+hint.isic.0.port="0xd80"
+hint.isic.0.maddr="0xd0000"
+hint.isic.0.irq="5"
+hint.isic.0.flags="2"
#
# Teles S0/16.3
options TEL_S0_16_3
+hint.isic.0.at="isa"
+hint.isic.0.port="0xd80"
+hint.isic.0.irq="5"
+hint.isic.0.flags="3"
#
# AVM A1 or AVM Fritz!Card
options AVM_A1
+hint.isic.0.at="isa"
+hint.isic.0.port="0x340"
+hint.isic.0.irq="5"
+hint.isic.0.flags="4"
#
# USRobotics Sportster ISDN TA intern
options USR_STI
+hint.isic.0.at="isa"
+hint.isic.0.port="0x268"
+hint.isic.0.irq="5"
+hint.isic.0.flags="7"
#
# ITK ix1 Micro ( < V.3, non-PnP version )
options ITKIX1
+hint.isic.0.at="isa"
+hint.isic.0.port="0x398"
+hint.isic.0.irq="10"
+hint.isic.0.flags="18"
#
# ELSA PCC-16
options ELSA_PCC16
+hint.isic.0.at="isa"
+hint.isic.0.port="0x360"
+hint.isic.0.irq="10"
+hint.isic.0.flags="20"
#
# ISA bus PnP Cards:
# ------------------
@@ -934,6 +1023,9 @@
#
# AVM B1 ISA bus (PnP mode not supported!)
# ----------------------------------------
+hint.iavc.0.at="isa"
+hint.iavc.0.port="0x150"
+hint.iavc.0.irq="5"
#
#---------------------------------------------------------------------------
# ISDN Protocol Stack - mandatory for all hardware drivers
==== //depot/projects/soc2006/intr_filter/sys/bus.h#8 (text+ko) ====
@@ -121,7 +121,6 @@
*/
#define device_method_t kobj_method_t
-#ifdef INTR_FILTER
/**
* @brief Driver interrupt filter return values
*
@@ -143,29 +142,8 @@
#define FILTER_STRAY 0x01
#define FILTER_HANDLED 0x02
#define FILTER_SCHEDULE_THREAD 0x04
-#endif
/**
- * @brief Driver interrupt filter return values
- *
- * If a driver provides an interrupt filter routine it must return an
- * integer consisting of oring together zero or more of the following
- * flags:
- *
- * FILTER_STRAY - this device did not trigger the interrupt
- * FILTER_HANDLED - the interrupt has been fully handled and can be EOId
- * FILTER_SCHEDULE_THREAD - the threaded interrupt handler should be
- * scheduled to execute
- *
- * If the driver does not provide a filter, then the interrupt code will
- * act is if the filter had returned FILTER_SCHEDULE_THREAD. Note that it
- * is illegal to specify any other flag with FILTER_STRAY and that it is
- * illegal to not specify either of FILTER_HANDLED or FILTER_SCHEDULE_THREAD
- * if FILTER_STRAY is not specified.
- */
-#define FILTER_STRAY 0x01
-#define FILTER_HANDLED 0x02
-#define FILTER_SCHEDULE_THREAD 0x04
* @brief Driver interrupt service routines
*
* The filter routine is run in primary interrupt context and may not
@@ -208,6 +186,7 @@
INTR_TYPE_MISC = 16,
INTR_TYPE_CLK = 32,
INTR_TYPE_AV = 64,
+ INTR_FAST = 128,
INTR_EXCL = 256, /* exclusive interrupt */
INTR_MPSAFE = 512, /* this interrupt is SMP safe */
INTR_ENTROPY = 1024 /* this interrupt provides entropy */
More information about the p4-projects
mailing list