From a4de56d6436291cdce81ea3de10f176e09020f4f Mon Sep 17 00:00:00 2001
From: maxgerhardt <maximilian.gerhardt@rub.de>
Date: Sun, 18 Jun 2023 00:58:13 +0200
Subject: [PATCH] Fix Unix compilation, remove ardulink check
---
minichlink/minichlink.c | 3 ---
minichlink/serial_dev.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/minichlink/minichlink.c b/minichlink/minichlink.c
index 0513750..191237b 100644
--- a/minichlink/minichlink.c
+++ b/minichlink/minichlink.c
@@ -41,13 +41,10 @@ void * MiniCHLinkInitAsDLL( struct MiniChlinkFunctions ** MCFO )
{
fprintf( stderr, "Found NHC-Link042 Programmer\n" );
}
-
-#ifndef DISABLE_ARDULINK
else if ((dev = TryInit_Ardulink()))
{
fprintf( stderr, "Found Ardulink Programmer\n" );
}
-#endif
else
{
fprintf( stderr, "Error: Could not initialize any supported programmers\n" );
diff --git a/minichlink/serial_dev.c b/minichlink/serial_dev.c
index 7afe36d..5a35fbe 100644
--- a/minichlink/serial_dev.c
+++ b/minichlink/serial_dev.c
@@ -58,7 +58,7 @@ int serial_dev_open(serial_dev_t *dev) {
return -1;
}
- if (tcgetattr(ctx->fd, &attr) == -1) {
+ if (tcgetattr(dev->fd, &attr) == -1) {
perror("tcgetattr");
return -2;
}
@@ -66,7 +66,7 @@ int serial_dev_open(serial_dev_t *dev) {
cfmakeraw(&attr);
cfsetspeed(&attr, dev->baud);
- if (tcsetattr(ctx->fd, TCSANOW, &attr) == -1) {
+ if (tcsetattr(dev->fd, TCSANOW, &attr) == -1) {
perror("tcsetattr");
return -3;
}
--
GitLab