aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-07-06 21:51:50 -0400
committerRob Austein <sra@hactrn.net>2016-07-06 21:51:50 -0400
commit32a7c7414a36282a201a5f690cb1fb999bd02b8a (patch)
tree3ac6b4d0b93fc264a91e9442273a4dec2780c2d3
parent7923c24511b1f176dfb69f199fba6fccb4954c0b (diff)
Previous "fix" to speed setting didn't compile on OSX.
-rw-r--r--.gitignore2
-rw-r--r--rpc_serial.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 3ca5e46..01c1858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,11 @@ tests/test-ecdsa-*.der
tests/test-hash
tests/test-mkmif
tests/test-pbkdf2
+tests/test-rpc_bighash
tests/test-rpc_get_random
tests/test-rpc_get_version
tests/test-rpc_hash
+tests/test-rpc_login
tests/test-rpc_pkey
tests/test-rpc_server
tests/test-rsa
diff --git a/rpc_serial.c b/rpc_serial.c
index 17addee..728bbd8 100644
--- a/rpc_serial.c
+++ b/rpc_serial.c
@@ -64,6 +64,7 @@ static int fd = -1;
hal_error_t hal_serial_init(const char * const device, const uint32_t speed)
{
struct termios tty;
+ speed_t termios_speed;
fd = open(device, O_RDWR | O_NOCTTY | O_SYNC);
if (fd == -1) {
@@ -75,7 +76,6 @@ hal_error_t hal_serial_init(const char * const device, const uint32_t speed)
return perror("tcgetattr"), HAL_ERROR_RPC_TRANSPORT;
#if !HAL_RPC_SERIAL_USE_MACOSX_IOCTL
- speed_t termios_speed;
switch (speed) {
case 115200: