X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/047aa72c4dab54576a2845356c1cf177f7eff26d..b13267a5123f6a14e47d788c4a8a2a8692e2a119:/sys/dev/raid/iir/iir.h diff --git a/sys/dev/raid/iir/iir.h b/sys/dev/raid/iir/iir.h index f7e953f2b2..618c0620b5 100644 --- a/sys/dev/raid/iir/iir.h +++ b/sys/dev/raid/iir/iir.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/iir/iir.h,v 1.3.2.2 2002/05/04 08:49:50 msmith Exp $ */ -/* $DragonFly: src/sys/dev/raid/iir/iir.h,v 1.3 2004/09/15 15:32:00 joerg Exp $ */ +/* $DragonFly: src/sys/dev/raid/iir/iir.h,v 1.6 2006/09/10 01:26:35 dillon Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -557,7 +557,7 @@ struct gdt_softc { #define GDT_SHUTDOWN 0x02 #define GDT_POLL_WAIT 0x80 struct callout watchdog_timer; - dev_t sc_dev; + cdev_t sc_dev; bus_space_tag_t sc_dpmemt; bus_space_handle_t sc_dpmemh; bus_addr_t sc_dpmembase; @@ -661,47 +661,35 @@ static __inline__ u_int16_t gdt_dec16(u_int8_t *); static __inline__ u_int32_t gdt_dec32(u_int8_t *); static __inline__ void -gdt_enc16(addr, value) - u_int8_t *addr; - u_int16_t value; +gdt_enc16(u_int8_t *addr, u_int16_t value) { *(u_int16_t *)addr = htole16(value); } static __inline__ void -gdt_enc32(addr, value) - u_int8_t *addr; - u_int32_t value; +gdt_enc32(u_int8_t *addr, u_int32_t value) { *(u_int32_t *)addr = htole32(value); } static __inline__ u_int16_t -gdt_dec16(addr) - u_int8_t *addr; +gdt_dec16(u_int8_t *addr) { return letoh16(*(u_int16_t *)addr); } static __inline__ u_int32_t -gdt_dec32(addr) - u_int8_t *addr; +gdt_dec32(u_int8_t *addr) { return letoh32(*(u_int32_t *)addr); } #endif -#if defined(__alpha__) -/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(va)) -#endif - extern TAILQ_HEAD(gdt_softc_list, gdt_softc) gdt_softcs; extern u_int8_t gdt_polling; -dev_t gdt_make_dev(int unit); -void gdt_destroy_dev(dev_t dev); +cdev_t gdt_make_dev(int unit); +void gdt_destroy_dev(cdev_t dev); void gdt_next(struct gdt_softc *gdt); void gdt_free_ccb(struct gdt_softc *gdt, struct gdt_ccb *gccb);