fgpa_read/write pexor ready (32-bit address)

diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c
index 54fdcce19ab11dca1efd647875e1e9eace7bef55..9d132ca23165a89db2b1b236454346c3fc20322a 100644 (file)
--- a/libtrbnet/trbnet.c
+++ b/libtrbnet/trbnet.c
@@ -1,4 +1,4 @@
-const char trbnet_version[] = "$Revision: 4.1 $";
+const char trbnet_version[] = "$Revision: 4.2 $";
 
 #include <stdlib.h>
 #include <signal.h>
@@ -255,7 +255,7 @@ static inline void com_reset_FPGA()
 
 #else   /* PEXOR */
 
-static inline int write32_to_FPGA(uint16_t address, uint32_t value)
+static inline int write32_to_FPGA(uint32_t address, uint32_t value)
 {
   struct pexor_reg_io descriptor;
   int status = 0;
@@ -276,7 +276,7 @@ static inline int write32_to_FPGA(uint16_t address, uint32_t value)
   return 0; 
 }
 
-static inline int read32_from_FPGA(uint16_t address, uint32_t* value)
+static inline int read32_from_FPGA(uint32_t address, uint32_t* value)
 {
   struct pexor_reg_io descriptor;
   int status = 0;
@@ -299,7 +299,7 @@ static inline int read32_from_FPGA(uint16_t address, uint32_t* value)
   return 0; 
 }
 
-static inline int read32_from_FPGA_dma(uint16_t fifo_address,
+static inline int read32_from_FPGA_dma(uint32_t fifo_address,
                                        uint32_t* values,
                                        uint32_t size)
 {
@@ -2015,7 +2015,11 @@ int trb_send_trigger_rich(uint8_t trg_input,
   return 0;
 }
 
+#ifndef PEXOR
 int fpga_register_read(uint16_t reg_address, uint32_t* value)
+#else
+int fpga_register_read(uint32_t reg_address, uint32_t* value)
+#endif
 {
   trb_errno = TRB_NONE;
 
@@ -2033,7 +2037,11 @@ int fpga_register_read(uint16_t reg_address, uint32_t* value)
   return 0;
 }
 
+#ifndef PEXOR
 int fpga_register_write(uint16_t reg_address, uint32_t value)
+#else
+int fpga_register_write(uint32_t reg_address, uint32_t value)
+#endif
 {
   trb_errno = TRB_NONE;
 

diff --git a/libtrbnet/trbnet.h b/libtrbnet/trbnet.h
index d51311fd027db38884edc7b808a87b90deec22f8..78955a2bc4d766ba495edd66aba89c6f39676a5e 100644 (file)
--- a/libtrbnet/trbnet.h
+++ b/libtrbnet/trbnet.h
@@ -78,9 +78,15 @@ int trb_send_trigger_rich(uint8_t input,
                           uint8_t random,
                           uint16_t number);
 
+#ifndef PEXOR
 int fpga_register_read(uint16_t reg_address, uint32_t* value);
 
 int fpga_register_write(uint16_t reg_address, uint32_t value);
+#else
+int fpga_register_read(uint32_t reg_address, uint32_t* value);
+
+int fpga_register_write(uint32_t reg_address, uint32_t value);
+#endif
 
 int trb_fifo_flush(uint8_t channel);