diff --git a/src/libs/compat/freebsd_network/bus.c b/src/libs/compat/freebsd_network/bus.c index a7549ac21d..435a575606 100644 --- a/src/libs/compat/freebsd_network/bus.c +++ b/src/libs/compat/freebsd_network/bus.c @@ -1,11 +1,8 @@ /* * Copyright 2007, Hugo Santos. All Rights Reserved. + * Copyright 2004, Marcus Overhagen. All Rights Reserved. + * * Distributed under the terms of the MIT License. - * - * Authors: - * Hugo Santos, hugosantos@gmail.com - * - * Some of this code is based on previous work by Marcus Overhagen. */ #include "device.h" @@ -18,6 +15,13 @@ #include +//#define DEBUG_BUS_SPACE_RW +#ifdef DEBUG_BUS_SPACE_RW +# define TRACE_BUS_SPACE_RW(x) driver_printf x +#else +# define TRACE_BUS_SPACE_RW(x) +#endif + #define ROUNDUP(a, b) (((a) + ((b)-1)) & ~((b)-1)) @@ -25,11 +29,9 @@ struct resource { int type; bus_space_tag_t tag; bus_space_handle_t handle; - area_id mapped_area; }; - struct internal_intr { device_t dev; driver_intr_t handler; @@ -349,15 +351,6 @@ bus_generic_driver_added(device_t dev, driver_t *driver) } -#define DEBUG_BUS_SPACE_RW - -#ifdef DEBUG_BUS_SPACE_RW -#define TRACE_BUS_SPACE_RW(x) driver_printf x -#else -#define TRACE_BUS_SPACE_RW(x) -#endif - - #define BUS_SPACE_READ(size, type, fun) \ type bus_space_read_##size(bus_space_tag_t tag, \ bus_space_handle_t handle, bus_size_t offset) \