Changeset 59f69ea in rtems-libbsd


Ignore:
Timestamp:
Jul 11, 2012, 5:48:58 PM (7 years ago)
Author:
Jennifer Averett <jennifer.averett@…>
Branches:
4.11, c1e05b9ea378b2971e3d7704779112b4bc4296da, freebsd-9.3, 4a77611a223ea883fb548679b516d326a020d447
Children:
9fc8b41
Parents:
2f50f0a
Message:

Some cleanup to allow build for multiple architectures.

Location:
rtemsbsd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • rtemsbsd/freebsd/machine/bus.h

    r2f50f0a r59f69ea  
    218218  #include <freebsd/machine/bus_space-simple_memory.h>
    219219#else
    220   #error "Bus space routines not implemented for this architecture!!"
     220  #warning "Bus space routines not implemented for this architecture!!"
     221  #warning "Defaulting to simple-memory Bus space routines!!"
     222  #include <freebsd/machine/bus_space-simple_memory.h>
    221223#endif
    222224
  • rtemsbsd/src/rtems-bsd-nexus.c

    r2f50f0a r59f69ea  
    5454#include <bsp/irq.h>
    5555#include <rtems/irq.h>
    56 
     56#include <freebsd/machine/bus.h>
     57
     58/* XXX Note:  These defines should be moved. */
    5759#if defined(__i386__)
    58 #include <freebsd/machine/rtems-bsd-config.h>
    59 #define I386_BUS_SPACE_MEM      0       /* space is mem space */
    60 #endif
    61 
    62 /* XXX */
     60  #define       BUS_SPACE_IO    I386_BUS_SPACE_IO
     61  #define       BUS_SPACE_MEM   I386_BUS_SPACE_MEM
     62#elif defined(__amd64__)
     63  #define       BUS_SPACE_IO    AMD64_BUS_SPACE_IO
     64  #define       BUS_SPACE_MEM   AMD64_BUS_SPACE_MEM
     65#else
     66  #warning "Bus space information not implemented for this architecture!!"
     67  #warning "Defaulting Bus space information!!"
     68  #define       BUS_SPACE_IO    0       
     69  #define       BUS_SPACE_MEM   1
     70#endif
     71
     72/* XXX - Just a guess */
    6373#define NUM_IO_INTS   30
    64 
    65 #ifdef __amd64__
    66 #define BUS_SPACE_IO    AMD64_BUS_SPACE_IO
    67 #define BUS_SPACE_MEM   AMD64_BUS_SPACE_MEM
    68 #else
    69 #define BUS_SPACE_IO    I386_BUS_SPACE_IO
    70 #define BUS_SPACE_MEM   I386_BUS_SPACE_MEM
    71 #endif
    72 
    7374
    7475#define DEVTONX(dev)    ((struct nexus_device *)device_get_ivars(dev))
Note: See TracChangeset for help on using the changeset viewer.