| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: isa_machdep.h,v 1.7 2008/04/28 20:23:34 martin Exp $ */ | | 1 | /* $NetBSD: isa_machdep.h,v 1.8 2009/08/19 14:41:57 dyoung Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 2007 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 2007 The NetBSD Foundation, Inc. |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
8 | * by Tim Rightnour | | 8 | * by Tim Rightnour |
9 | * | | 9 | * |
10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
12 | * are met: | | 12 | * are met: |
13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -33,23 +33,25 @@ | | | @@ -33,23 +33,25 @@ |
33 | #define _MACHINE_ISA_MACHDEP_H_ | | 33 | #define _MACHINE_ISA_MACHDEP_H_ |
34 | | | 34 | |
35 | #include <powerpc/isa_machdep.h> | | 35 | #include <powerpc/isa_machdep.h> |
36 | | | 36 | |
37 | #define isa_outb(x,y) outb(SANDPOINT_BUS_SPACE_IO + (x), y) | | 37 | #define isa_outb(x,y) outb(SANDPOINT_BUS_SPACE_IO + (x), y) |
38 | #define isa_inb(x) inb(SANDPOINT_BUS_SPACE_IO + (x)) | | 38 | #define isa_inb(x) inb(SANDPOINT_BUS_SPACE_IO + (x)) |
39 | | | 39 | |
40 | extern struct powerpc_bus_dma_tag isa_bus_dma_tag; | | 40 | extern struct powerpc_bus_dma_tag isa_bus_dma_tag; |
41 | extern struct pic_ops *isa_pic; | | 41 | extern struct pic_ops *isa_pic; |
42 | | | 42 | |
43 | /* function mappings */ | | 43 | /* function mappings */ |
44 | #define isa_attach_hook(p, s, iaa) \ | | 44 | #define isa_attach_hook(p, s, iaa) \ |
45 | genppc_isa_attach_hook(p, s, iaa) | | 45 | genppc_isa_attach_hook(p, s, iaa) |
| | | 46 | #define isa_detach_hook(s) \ |
| | | 47 | genppc_isa_detach_hook(s) |
46 | #define isa_intr_evcnt(ic, irq) \ | | 48 | #define isa_intr_evcnt(ic, irq) \ |
47 | genppc_isa_intr_evcnt(ic, irq) | | 49 | genppc_isa_intr_evcnt(ic, irq) |
48 | #define isa_intr_establish(ic, irq, type, level, fun, arg) \ | | 50 | #define isa_intr_establish(ic, irq, type, level, fun, arg) \ |
49 | genppc_isa_intr_establish(ic, irq, type, level, fun, arg) | | 51 | genppc_isa_intr_establish(ic, irq, type, level, fun, arg) |
50 | #define isa_intr_disestablish(ic, arg) \ | | 52 | #define isa_intr_disestablish(ic, arg) \ |
51 | genppc_isa_intr_disestablish(ic, arg) | | 53 | genppc_isa_intr_disestablish(ic, arg) |
52 | #define isa_intr_alloc(ic, mask, type, irqp) \ | | 54 | #define isa_intr_alloc(ic, mask, type, irqp) \ |
53 | genppc_isa_intr_alloc(ic, isa_pic, mask, type, irqp) | | 55 | genppc_isa_intr_alloc(ic, isa_pic, mask, type, irqp) |
54 | | | 56 | |
55 | #endif /* _MACHINE_ISA_MACHDEP_H_ */ | | 57 | #endif /* _MACHINE_ISA_MACHDEP_H_ */ |