From: hadaq Date: Mon, 7 Sep 2009 20:01:37 +0000 (+0000) Subject: bugfix X-Git-Tag: v6.0~354 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1867636828dd9673d9d3026462c2dac6fc51a9c6;p=trbnettools.git bugfix --- diff --git a/libtrbnet/fs_fpga_int_mem.c b/libtrbnet/fs_fpga_int_mem.c index 6202a29..705979b 100644 --- a/libtrbnet/fs_fpga_int_mem.c +++ b/libtrbnet/fs_fpga_int_mem.c @@ -19,13 +19,12 @@ void write32_to_FPGA(uint16_t address, uint32_t value) writePC((value & 0xffff) | (toggleBit ^ TOGGLE_BIT)); } - /* reads a 32bit word from a given address on a given device */ -int read32_from_FPGA(uint16_t address, uint32_t* value) +void read32_from_FPGA(uint16_t address, uint32_t* value) { uint32_t toggleBit = readPC() & TOGGLE_BIT; - /* set address RW_WRITE */ + /* set address RW_READ */ writePC((address | 0x8000) | (toggleBit ^ TOGGLE_BIT)); /* read value */ @@ -34,8 +33,6 @@ int read32_from_FPGA(uint16_t address, uint32_t* value) *value |= (readPB() & 0xffff); writePC(toggleBit ^ TOGGLE_BIT); - - return 0; } diff --git a/libtrbnet/fs_fpga_int_mem.h b/libtrbnet/fs_fpga_int_mem.h index 11f61b2..0f38ef7 100644 --- a/libtrbnet/fs_fpga_int_mem.h +++ b/libtrbnet/fs_fpga_int_mem.h @@ -3,18 +3,18 @@ #include -/* writes a 32bit word to a given address on a given device */ +/* Writes a 32bit word to a given address on a given device */ void write32_to_FPGA(uint16_t address, uint32_t value); -/* reads a 32bit word from a given address on a given device */ -int read32_from_FPGA(uint16_t address, uint32_t* value); +/* Reads a 32bit word from a given address on a given device */ +void read32_from_FPGA(uint16_t address, uint32_t* value); -/* do not use, not yet implemented, returns -1 always */ +/* Do not use, not yet implemented, returns -1 always */ int read32_from_FPGA_dma(uint16_t fifo_address, uint32_t* values, uint32_t size); -/* sends reset for communication logic PC(17, 16) = 11 */ +/* sends a reset to the communication logic PC(17, 16) = 11 */ void com_reset(); #endif