summaryrefslogtreecommitdiffstats
path: root/sys/dev/cy
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-11-04 17:08:13 +0000
committerbde <bde@FreeBSD.org>1995-11-04 17:08:13 +0000
commit6073486300a2c7430d184a9a41ad42bcb0c4345c (patch)
treea314bfc13d707ab8df235edc500e88916380d16d /sys/dev/cy
parente2427bd86958366ec25f29d70bb5c148c61a704b (diff)
downloadFreeBSD-src-6073486300a2c7430d184a9a41ad42bcb0c4345c.zip
FreeBSD-src-6073486300a2c7430d184a9a41ad42bcb0c4345c.tar.gz
Added `#include "ioconf.h"' to <machine/conf.h> and cleaned up the
misplaced extern declarations (mostly prototypes of interrupt handlers) that this exposed. The prototypes should be moved back to the driver sources when the functions are staticalized. Added idempotency guards to <machine/conf.h>. "ioconf.h" can't be included when building LKMs so define a wart in bsd.kmod.mk to help guard against including it.
Diffstat (limited to 'sys/dev/cy')
-rw-r--r--sys/dev/cy/cy.c5
-rw-r--r--sys/dev/cy/cy_isa.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 786ae30..0b90ac0 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
+ * $Id: cy.c,v 1.17 1995/11/04 13:23:31 bde Exp $
*/
#include "cy.h"
@@ -325,8 +325,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
-void siointr __P((int unit));
-void siointrts __P((int unit));
+inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 786ae30..0b90ac0 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
+ * $Id: cy.c,v 1.17 1995/11/04 13:23:31 bde Exp $
*/
#include "cy.h"
@@ -325,8 +325,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
-void siointr __P((int unit));
-void siointrts __P((int unit));
+inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */
OpenPOWER on IntegriCloud