Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-12-01 13:51:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixed compile time issues (#294)

Browse Source 
* Fixed compile time issues

* Fix compile time error in sasidump.cpp

* Fix comment in Makefile

* Fix compile time error in sasidump.cpp

* Restore rasdump and sasidump to BIN_ALL

Co-authored-by: Daniel Markstedt <markstedt@gmail.com>
This commit is contained in:
Uwe Seimet 2021-10-02 01:28:14 +02:00 committed by GitHub
parent af4e3dfe80
commit 0fb8753920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/raspberrypi/Makefile
View File

@ -64,10 +64,12 @@ OS_FILES = ./os_integration
OBJDIR := ./obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]') OBJDIR := ./obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
BINDIR := ./bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]') BINDIR := ./bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
#BIN_ALL = $(RASCSI) $(RASCTL) $(RASDUMP) $(SASIDUMP) $(SCSIMON) BIN_ALL = \
# Temporarily remove the RASDUMP and RASDUMP tools, since they're not needed $(BINDIR)/$(RASCSI) \
# for my specific use case. If you need them - add them back in! $(BINDIR)/$(RASCTL) \
BIN_ALL = $(BINDIR)/$(RASCSI) $(BINDIR)/$(RASCTL) $(BINDIR)/$(SCSIMON) $(BINDIR)/$(SCSIMON) \
$(BINDIR)/$(RASDUMP) \
$(BINDIR)/$(SASIDUMP)
SRC_PROTOC = \ SRC_PROTOC = \
rascsi_interface.proto rascsi_interface.proto

5
src/raspberrypi/rasdump.cpp
View File

@ -9,6 +9,7 @@
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <errno.h>
#include "os.h" #include "os.h"
#include "fileio.h" #include "fileio.h"
#include "filepath.h" #include "filepath.h"
@ -282,7 +283,7 @@ bool Command(BYTE *buf, int length)
} }
// Send Command // Send Command
count = bus.SendHandShake(buf, length); count = bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
// Success if the transmission result is the same as the number // Success if the transmission result is the same as the number
// of requests // of requests
@ -323,7 +324,7 @@ int DataOut(BYTE *buf, int length)
} }
// Data transmission // Data transmission
return bus.SendHandShake(buf, length); return bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

5
src/raspberrypi/sasidump.cpp
View File

@ -18,6 +18,7 @@
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <errno.h>
#include "os.h" #include "os.h"
#include "fileio.h" #include "fileio.h"
#include "filepath.h" #include "filepath.h"
@ -269,7 +270,7 @@ bool Command(BYTE *buf, int length)
} }
// Send command // Send command
count = bus.SendHandShake(buf, length); count = bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
// Return true is send results match number of requests // Return true is send results match number of requests
if (count == length) { if (count == length) {
@ -309,7 +310,7 @@ int DataOut(BYTE *buf, int length)
} }
// Receive data // Receive data
return bus.SendHandShake(buf, length); return bus.SendHandShake(buf, length, BUS::SEND_NO_DELAY);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------