diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-02-27 01:00:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-02-27 01:00:35 -0600 |
| commit | 6ed57d34cab70cfcada21d3b77014f2e834a0cf9 (patch) | |
| tree | 5ea8f7750945b29557ff34ae10147bc61f21fbf3 /servers/fpga_server_lin/src/fpga_conn.cpp | |
| parent | 1fbfe130665dc4bce56869ed9158531137406129 (diff) | |
| download | ulab-6ed57d34cab70cfcada21d3b77014f2e834a0cf9.tar.gz ulab-6ed57d34cab70cfcada21d3b77014f2e834a0cf9.zip | |
First pass of logic analyzer functionality (GPMC interface and server)
Diffstat (limited to 'servers/fpga_server_lin/src/fpga_conn.cpp')
| -rw-r--r-- | servers/fpga_server_lin/src/fpga_conn.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/fpga_server_lin/src/fpga_conn.cpp b/servers/fpga_server_lin/src/fpga_conn.cpp index 0e1aa17..6ab85a2 100644 --- a/servers/fpga_server_lin/src/fpga_conn.cpp +++ b/servers/fpga_server_lin/src/fpga_conn.cpp @@ -235,7 +235,7 @@ int FPGASocket::setupSerial() { newtio.c_cc[VTIME] = 0; // Inter-character timer unused newtio.c_cc[VMIN] = 0; // Blocking read unused - + tcflush(m_fd_tty, TCIFLUSH); tcsetattr(m_fd_tty, TCSANOW, &newtio); @@ -305,14 +305,14 @@ void FPGASocket::commandLoop() { cc = readBlock(buffer, 1024); if (cc > 0) { ret = write(m_fd_tty, buffer, cc); - + // HACK // This works around a buffer overflow on FTDI serial devices // It may not be sufficient for baudrates less than 115200! if (cc > 128) { usleep(100000); } - + while ((ret < 0) && (errno == EAGAIN)) { usleep(1000); ret = write(m_fd_tty, buffer, cc); @@ -354,7 +354,7 @@ void FPGASocket::commandLoop() { char data[42]; // Read state data from memory map and assemble a reply - memcpy_from_gpmc(data+0, 0x20, 0x1f); // LCD display + memcpy_from_gpmc(data+0, 0x20, 0x20); // LCD display data[32] = 1; // Input mode (locked to Remote) data[33] = read_gpmc(0x0b); // Number of address bits of DSP RAM data[34] = read_gpmc(0x02); // 4-bit LEDs |