Changeset 8328

Show
Ignore:
Timestamp:
05/08/08 17:09:28
Author:
matt
Message:

changed definitions on the GPIO lines

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • usrp2/trunk/firmware/lib/memory_map.h

    r8249 r8328  
    150150typedef struct { 
    151151  volatile uint32_t     io;       // tx data in high 16, rx in low 16 
    152   volatile uint32_t     rx_mode;  // 16 2-bit fields 
    153   volatile uint32_t     tx_mode;  // 16 2-bit fields 
     152  volatile uint32_t     tx_sel;   // 16 2-bit fields select which source goes to TX DB 
     153  volatile uint32_t     rx_sel;   // 16 2-bit fields select which source goes to RX DB 
     154  volatile uint32_t     ddr;      // 32 bits, 1 means output 
    154155} gpio_regs_t; 
    155156 
    156157// each 2-bit mode field is layed out this way 
    157 #define GPIOM_INPUT    0 // pin is an input, readable by proc through io reg 
    158 #define GPIOM_OUTPUT   1 // pin is an output, writable by proc through io reg 
    159 #define GPIOM_FPGA_0   2 // pin is an output, writable from FPGA fabric 
    160 #define GPIOM_FPGA_1   3 // pin is an output, writable from FPGA fabric 
     158#define GPIOM_SW       0 // if pin is an output, set by software in the io reg 
     159#define GPIOM_ATR      1 // if pin is an output, set by ATR logic 
     160#define GPIOM_DEBUG_0  2 // if pin is an output, debug lines from FPGA fabric 
     161#define GPIOM_DEBUG_1  3 // if pin is an output, debug lines from FPGA fabric 
    161162 
    162163#define gpio_base ((gpio_regs_t *) GPIO_BASE)