Skip to content

C
Compact Universal Timing Endpoint based on White Rabbit
Commit dffc800f authored by Qiang Du's avatar Qiang Du
Browse files
Options

Remove trailing spaces in eb-*.c

parent 360ce693
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 185 deletions
tools/eb-console.c
View file @ dffc800f
/** @file eb-info.c /** @file eb-info.c
* @brief Report the contents of an FPGA using Etherbone. * @brief Report the contents of an FPGA using Etherbone.
* *
* Copyright (C) 2013 GSI Helmholtz Centre for Heavy Ion Research GmbH * Copyright (C) 2013 GSI Helmholtz Centre for Heavy Ion Research GmbH
* *
* A complete skeleton of an application using the Etherbone library. * A complete skeleton of an application using the Etherbone library.
* *
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************* *******************************************************************************
...@@ -69,12 +69,12 @@ int main(int argc, char** argv) { ...@@ -69,12 +69,12 @@ int main(int argc, char** argv) {
eb_data_t rx_data[BATCH_SIZE], tx_data, done; eb_data_t rx_data[BATCH_SIZE], tx_data, done;
eb_cycle_t cycle; eb_cycle_t cycle;
char byte; char byte;
/* Default arguments */ /* Default arguments */
program = argv[0]; program = argv[0];
error = 0; error = 0;
i = -1; i = -1;
/* Process the command-line arguments */ /* Process the command-line arguments */
error = 0; error = 0;
while ((opt = getopt(argc, argv, "i:h")) != -1) { while ((opt = getopt(argc, argv, "i:h")) != -1) {
...@@ -98,24 +98,24 @@ int main(int argc, char** argv) { ...@@ -98,24 +98,24 @@ int main(int argc, char** argv) {
error = 1; error = 1;
} }
} }
if (error) return 1; if (error) return 1;
if (optind + 1 != argc) { if (optind + 1 != argc) {
fprintf(stderr, "%s: expecting three non-optional arguments: <proto/host/port>\n", program); fprintf(stderr, "%s: expecting three non-optional arguments: <proto/host/port>\n", program);
return 1; return 1;
} }
if ((status = eb_socket_open(EB_ABI_CODE, 0, EB_DATAX|EB_ADDRX, &socket)) != EB_OK) if ((status = eb_socket_open(EB_ABI_CODE, 0, EB_DATAX|EB_ADDRX, &socket)) != EB_OK)
die("eb_socket_open", status); die("eb_socket_open", status);
if ((status = eb_device_open(socket, argv[optind], EB_DATAX|EB_ADDRX, 3, &device)) != EB_OK) if ((status = eb_device_open(socket, argv[optind], EB_DATAX|EB_ADDRX, 3, &device)) != EB_OK)
die(argv[optind], status); die(argv[optind], status);
c = sizeof(sdb)/sizeof(struct sdb_device); c = sizeof(sdb)/sizeof(struct sdb_device);
if ((status = eb_sdb_find_by_identity(device, CERN_ID, UART_ID, &sdb[0], &c)) != EB_OK) if ((status = eb_sdb_find_by_identity(device, CERN_ID, UART_ID, &sdb[0], &c)) != EB_OK)
die("eb_sdb_find_by_identity", status); die("eb_sdb_find_by_identity", status);
if (i == -1) { if (i == -1) {
if (c != 1) { if (c != 1) {
fprintf(stderr, "%s: found %d UARTs on that device; pick one with -i #\n", program, c); fprintf(stderr, "%s: found %d UARTs on that device; pick one with -i #\n", program, c);
...@@ -128,11 +128,11 @@ int main(int argc, char** argv) { ...@@ -128,11 +128,11 @@ int main(int argc, char** argv) {
fprintf(stderr, "%s: could not find UART #%d on that device (%d total)\n", program, i, c); fprintf(stderr, "%s: could not find UART #%d on that device (%d total)\n", program, i, c);
exit(1); exit(1);
} }
printf("Connected to uart at address %"PRIx64"\n", sdb[i].sdb_component.addr_first); printf("Connected to uart at address %"PRIx64"\n", sdb[i].sdb_component.addr_first);
tx = sdb[i].sdb_component.addr_first + VUART_TX; tx = sdb[i].sdb_component.addr_first + VUART_TX;
rx = sdb[i].sdb_component.addr_first + VUART_RX; rx = sdb[i].sdb_component.addr_first + VUART_RX;
/* disable input buffering and echo */ /* disable input buffering and echo */
tcgetattr(STDIN_FD, &old); tcgetattr(STDIN_FD, &old);
tcgetattr(STDIN_FD, &tc); tcgetattr(STDIN_FD, &tc);
...@@ -144,29 +144,29 @@ int main(int argc, char** argv) { ...@@ -144,29 +144,29 @@ int main(int argc, char** argv) {
tc.c_cc[VTIME]=0; tc.c_cc[VTIME]=0;
tcflush(STDIN_FD, TCIFLUSH); tcflush(STDIN_FD, TCIFLUSH);
tcsetattr(STDIN_FD, TCSANOW, &tc); tcsetattr(STDIN_FD, TCSANOW, &tc);
flags = fcntl(STDIN_FD, F_GETFL, 0); flags = fcntl(STDIN_FD, F_GETFL, 0);
flags |= O_NONBLOCK; flags |= O_NONBLOCK;
fcntl(STDIN_FD, F_SETFL, flags); fcntl(STDIN_FD, F_SETFL, flags);
/* be lazy and just poll for now */ /* be lazy and just poll for now */
busy = 0; busy = 0;
while (1) { while (1) {
if (!busy) usleep(10000); /* 10ms */ if (!busy) usleep(10000); /* 10ms */
/* Poll for status */ /* Poll for status */
eb_cycle_open(device, 0, eb_block, &cycle); eb_cycle_open(device, 0, eb_block, &cycle);
eb_cycle_read(cycle, rx, EB_BIG_ENDIAN|EB_DATA32, &rx_data[0]); eb_cycle_read(cycle, rx, EB_BIG_ENDIAN|EB_DATA32, &rx_data[0]);
eb_cycle_read(cycle, tx, EB_BIG_ENDIAN|EB_DATA32, &done); eb_cycle_read(cycle, tx, EB_BIG_ENDIAN|EB_DATA32, &done);
eb_cycle_close(cycle); eb_cycle_close(cycle);
/* Bulk read anything extra */ /* Bulk read anything extra */
if ((rx_data[0] & 0x100) != 0) { if ((rx_data[0] & 0x100) != 0) {
eb_cycle_open(device, 0, eb_block, &cycle); eb_cycle_open(device, 0, eb_block, &cycle);
for (i = 1; i < BATCH_SIZE; ++i) for (i = 1; i < BATCH_SIZE; ++i)
eb_cycle_read(cycle, rx, EB_BIG_ENDIAN|EB_DATA32, &rx_data[i]); eb_cycle_read(cycle, rx, EB_BIG_ENDIAN|EB_DATA32, &rx_data[i]);
eb_cycle_close(cycle); eb_cycle_close(cycle);
for (i = 0; i < BATCH_SIZE; ++i) { for (i = 0; i < BATCH_SIZE; ++i) {
if ((rx_data[i] & 0x100) == 0) continue; if ((rx_data[i] & 0x100) == 0) continue;
byte = rx_data[i] & 0xFF; byte = rx_data[i] & 0xFF;
...@@ -174,9 +174,9 @@ int main(int argc, char** argv) { ...@@ -174,9 +174,9 @@ int main(int argc, char** argv) {
} }
fflush(stdout); fflush(stdout);
} }
busy = busy && (done & 0x100) == 0; busy = busy && (done & 0x100) == 0;
if (!busy && read(STDIN_FD, &byte, 1) == 1) { if (!busy && read(STDIN_FD, &byte, 1) == 1) {
if (byte == 3) { /* control-C */ if (byte == 3) { /* control-C */
tcsetattr(STDIN_FD, TCSANOW, &old); tcsetattr(STDIN_FD, TCSANOW, &old);
...@@ -187,6 +187,6 @@ int main(int argc, char** argv) { ...@@ -187,6 +187,6 @@ int main(int argc, char** argv) {
busy = 1; busy = 1;
} }
} }
return 0; return 0;
} }
tools/eb-flash.c
View file @ dffc800f
This diff is collapsed.
tools/eb-info.c
View file @ dffc800f
/** @file eb-info.c /** @file eb-info.c
* @brief Report the contents of an FPGA using Etherbone. * @brief Report the contents of an FPGA using Etherbone.
* *
* Copyright (C) 2013 GSI Helmholtz Centre for Heavy Ion Research GmbH * Copyright (C) 2013 GSI Helmholtz Centre for Heavy Ion Research GmbH
* *
* A complete skeleton of an application using the Etherbone library. * A complete skeleton of an application using the Etherbone library.
* *
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************* *******************************************************************************
...@@ -58,11 +58,11 @@ int main(int argc, char** argv) { ...@@ -58,11 +58,11 @@ int main(int argc, char** argv) {
eb_device_t device; eb_device_t device;
eb_cycle_t cycle; eb_cycle_t cycle;
eb_data_t *data; eb_data_t *data;
/* Default arguments */ /* Default arguments */
program = argv[0]; program = argv[0];
error = 0; error = 0;
/* Process the command-line arguments */ /* Process the command-line arguments */
error = 0; error = 0;
while ((opt = getopt(argc, argv, "h")) != -1) { while ((opt = getopt(argc, argv, "h")) != -1) {
...@@ -79,20 +79,20 @@ int main(int argc, char** argv) { ...@@ -79,20 +79,20 @@ int main(int argc, char** argv) {
error = 1; error = 1;
} }
} }
if (error) return 1; if (error) return 1;
if (optind + 1 != argc) { if (optind + 1 != argc) {
fprintf(stderr, "%s: expecting three non-optional arguments: <proto/host/port>\n", program); fprintf(stderr, "%s: expecting three non-optional arguments: <proto/host/port>\n", program);
return 1; return 1;
} }
if ((status = eb_socket_open(EB_ABI_CODE, 0, EB_DATAX|EB_ADDRX, &socket)) != EB_OK) if ((status = eb_socket_open(EB_ABI_CODE, 0, EB_DATAX|EB_ADDRX, &socket)) != EB_OK)
die("eb_socket_open", status); die("eb_socket_open", status);
if ((status = eb_device_open(socket, argv[optind], EB_DATAX|EB_ADDRX, 3, &device)) != EB_OK) if ((status = eb_device_open(socket, argv[optind], EB_DATAX|EB_ADDRX, 3, &device)) != EB_OK)
die(argv[optind], status); die(argv[optind], status);
c = 1; c = 1;
if ((status = eb_sdb_find_by_identity(device, GSI_ID, ROM_ID, &sdb, &c)) != EB_OK) if ((status = eb_sdb_find_by_identity(device, GSI_ID, ROM_ID, &sdb, &c)) != EB_OK)
die("eb_sdb_find_by_identity", status); die("eb_sdb_find_by_identity", status);
...@@ -100,27 +100,27 @@ int main(int argc, char** argv) { ...@@ -100,27 +100,27 @@ int main(int argc, char** argv) {
fprintf(stderr, "Found %d ROM identifiers on that device\n", c); fprintf(stderr, "Found %d ROM identifiers on that device\n", c);
exit(1); exit(1);
} }
if ((status = eb_cycle_open(device, 0, 0, &cycle)) != EB_OK) if ((status = eb_cycle_open(device, 0, 0, &cycle)) != EB_OK)
die("eb_cycle_open", status); die("eb_cycle_open", status);
len = ((sdb.sdb_component.addr_last - sdb.sdb_component.addr_first) + 1) / 4; len = ((sdb.sdb_component.addr_last - sdb.sdb_component.addr_first) + 1) / 4;
if ((data = malloc(len * sizeof(eb_data_t))) == 0) if ((data = malloc(len * sizeof(eb_data_t))) == 0)
die("malloc", EB_OOM); die("malloc", EB_OOM);
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
eb_cycle_read(cycle, sdb.sdb_component.addr_first + i*4, EB_DATA32|EB_BIG_ENDIAN, &data[i]); eb_cycle_read(cycle, sdb.sdb_component.addr_first + i*4, EB_DATA32|EB_BIG_ENDIAN, &data[i]);
if ((status = eb_cycle_close(cycle)) != EB_OK) if ((status = eb_cycle_close(cycle)) != EB_OK)
die("eb_cycle_close", status); die("eb_cycle_close", status);
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
printf("%c%c%c%c", printf("%c%c%c%c",
(char)(data[i] >> 24) & 0xff, (char)(data[i] >> 24) & 0xff,
(char)(data[i] >> 16) & 0xff, (char)(data[i] >> 16) & 0xff,
(char)(data[i] >> 8) & 0xff, (char)(data[i] >> 8) & 0xff,
(char)(data[i] ) & 0xff); (char)(data[i] ) & 0xff);
} }
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment