[rtems-libbsd commit] Some cleanup to allow build for multiple architectures.
Jennifer Averett
jennifer at rtems.org
Wed Jul 11 17:45:26 UTC 2012
Module: rtems-libbsd
Branch: master
Commit: 59f69ea3cda42df5164fd298ef2ed0475cc56886
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=59f69ea3cda42df5164fd298ef2ed0475cc56886
Author: Jennifer Averett <jennifer.averett at oarcorp.com>
Date: Wed Jul 11 12:48:58 2012 -0500
Some cleanup to allow build for multiple architectures.
---
rtemsbsd/freebsd/machine/bus.h | 4 +++-
rtemsbsd/src/rtems-bsd-nexus.c | 25 +++++++++++++------------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/rtemsbsd/freebsd/machine/bus.h b/rtemsbsd/freebsd/machine/bus.h
index f62ca45..18689de 100644
--- a/rtemsbsd/freebsd/machine/bus.h
+++ b/rtemsbsd/freebsd/machine/bus.h
@@ -217,7 +217,9 @@ bus_space_free(bus_space_tag_t bst __unused, bus_space_handle_t bsh, bus_size_t
#elif defined(__ppc__)
#include <freebsd/machine/bus_space-simple_memory.h>
#else
- #error "Bus space routines not implemented for this architecture!!"
+ #warning "Bus space routines not implemented for this architecture!!"
+ #warning "Defaulting to simple-memory Bus space routines!!"
+ #include <freebsd/machine/bus_space-simple_memory.h>
#endif
#include <freebsd/machine/bus_dma.h>
diff --git a/rtemsbsd/src/rtems-bsd-nexus.c b/rtemsbsd/src/rtems-bsd-nexus.c
index fe2e23a..8520221 100644
--- a/rtemsbsd/src/rtems-bsd-nexus.c
+++ b/rtemsbsd/src/rtems-bsd-nexus.c
@@ -53,23 +53,24 @@
#include <freebsd/machine/rtems-bsd-devicet.h>
#include <bsp/irq.h>
#include <rtems/irq.h>
+#include <freebsd/machine/bus.h>
+/* XXX Note: These defines should be moved. */
#if defined(__i386__)
-#include <freebsd/machine/rtems-bsd-config.h>
-#define I386_BUS_SPACE_MEM 0 /* space is mem space */
-#endif
-
-/* XXX */
-#define NUM_IO_INTS 30
-
-#ifdef __amd64__
-#define BUS_SPACE_IO AMD64_BUS_SPACE_IO
-#define BUS_SPACE_MEM AMD64_BUS_SPACE_MEM
+ #define BUS_SPACE_IO I386_BUS_SPACE_IO
+ #define BUS_SPACE_MEM I386_BUS_SPACE_MEM
+#elif defined(__amd64__)
+ #define BUS_SPACE_IO AMD64_BUS_SPACE_IO
+ #define BUS_SPACE_MEM AMD64_BUS_SPACE_MEM
#else
-#define BUS_SPACE_IO I386_BUS_SPACE_IO
-#define BUS_SPACE_MEM I386_BUS_SPACE_MEM
+ #warning "Bus space information not implemented for this architecture!!"
+ #warning "Defaulting Bus space information!!"
+ #define BUS_SPACE_IO 0
+ #define BUS_SPACE_MEM 1
#endif
+/* XXX - Just a guess */
+#define NUM_IO_INTS 30
#define DEVTONX(dev) ((struct nexus_device *)device_get_ivars(dev))
More information about the vc
mailing list