Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #498 from jg1uaa/master

Browse source 
Add OpenBSD support
This commit is contained in:
Jonathan Naylor 2019-03-18 08:03:53 +00:00 committed by GitHub
commit 5acef270d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
I2CController.cpp
View file

@ -63,7 +63,7 @@ int CI2CController::write(const unsigned char* buffer, unsigned int length)
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <termios.h> #include <termios.h>
#if !defined(__APPLE__) #if defined(__linux__)
#include <linux/i2c-dev.h> #include <linux/i2c-dev.h>
#endif #endif
@ -81,7 +81,7 @@ bool CI2CController::open()
{ {
assert(m_fd == -1); assert(m_fd == -1);
#if !defined(__APPLE__) #if defined(__linux__)
m_fd = ::open(m_device.c_str(), O_RDWR); m_fd = ::open(m_device.c_str(), O_RDWR);
if (m_fd < 0) { if (m_fd < 0) {
LogError("Cannot open device - %s", m_device.c_str()); LogError("Cannot open device - %s", m_device.c_str());
@ -100,7 +100,7 @@ bool CI2CController::open()
return false; return false;
} }
#else #else
#warning "I2C controller does not support OSX" #warning "I2C controller supports Linux only"
#endif #endif
return true; return true;
@ -117,7 +117,7 @@ int CI2CController::read(unsigned char* buffer, unsigned int length)
unsigned int offset = 0U; unsigned int offset = 0U;
while (offset < length) { while (offset < length) {
#if !defined(__APPLE__) #if defined(__linux__)
ssize_t n = ::read(m_fd, buffer + offset, 1U); ssize_t n = ::read(m_fd, buffer + offset, 1U);
if (n < 0) { if (n < 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
@ -145,7 +145,7 @@ int CI2CController::write(const unsigned char* buffer, unsigned int length)
unsigned int ptr = 0U; unsigned int ptr = 0U;
while (ptr < length) { while (ptr < length) {
ssize_t n = 0U; ssize_t n = 0U;
#if !defined(__APPLE__) #if defined(__linux__)
n = ::write(m_fd, buffer + ptr, 1U); n = ::write(m_fd, buffer + ptr, 1U);
#endif #endif
if (n < 0) { if (n < 0) {

4
Makefile
View file

@ -1,7 +1,7 @@
# This makefile is for all platforms, but doesn't include support for the HD44780, OLED, or PCF8574 displays on the Raspberry Pi. # This makefile is for all platforms, but doesn't include support for the HD44780, OLED, or PCF8574 displays on the Raspberry Pi.
CC = gcc CC = cc
CXX = g++ CXX = c++
CFLAGS = -g -O3 -Wall -std=c++0x -pthread CFLAGS = -g -O3 -Wall -std=c++0x -pthread
LIBS = -lpthread LIBS = -lpthread
LDFLAGS = -g LDFLAGS = -g

1
NetworkInfo.cpp
View file

@ -28,6 +28,7 @@
#include <sys/types.h> #include <sys/types.h>
#if !defined(_WIN32) && !defined(_WIN64) #if !defined(_WIN32) && !defined(_WIN64)
#include <ifaddrs.h> #include <ifaddrs.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>

3
SerialController.cpp
View file

@ -35,9 +35,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <termios.h> #include <termios.h>
#if !defined(__APPLE__)
#include <linux/i2c-dev.h>
#endif
#endif #endif