SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@590 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2017-12-27 08:54:04 +00:00
parent 230147cdb4
commit beb23e5a50
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src_main/io/pispi.cpp
View File

@@ -1,9 +1,9 @@
#include "pispi.h" #include "pispi.h"
#include "piincludes_p.h" #include "piincludes_p.h"
#if !defined(WINDOWS) && !defined(MAC_OS) #if !defined(WINDOWS) && !defined(MAC_OS)
# define PISPI # define PIP_SPI
#endif #endif
#ifdef PISPI #ifdef PIP_SPI
# include <fcntl.h> # include <fcntl.h>
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <linux/spi/spidev.h> # include <linux/spi/spidev.h>
@@ -11,7 +11,7 @@
PRIVATE_DEFINITION_START(PISPI) PRIVATE_DEFINITION_START(PISPI)
#ifdef PISPI #ifdef PIP_SPI
int fd; int fd;
spi_ioc_transfer spi_ioc_tr; spi_ioc_transfer spi_ioc_tr;
#endif #endif
@@ -29,7 +29,7 @@ PISPI::PISPI(const PIString & path, uint speed, PIIODevice::DeviceMode mode) : P
spi_mode = 0; spi_mode = 0;
if (mode == ReadOnly) if (mode == ReadOnly)
piCoutObj << "error, SPI can't work in ReadOnly mode"; piCoutObj << "error, SPI can't work in ReadOnly mode";
#ifdef PISPI #ifdef PIP_SPI
PRIVATE->fd = 0; PRIVATE->fd = 0;
#endif #endif
} }
@@ -59,7 +59,7 @@ bool PISPI::isParameterSet(PISPI::Parameters parameter) const {
bool PISPI::openDevice() { bool PISPI::openDevice() {
#ifdef PISPI #ifdef PIP_SPI
int ret = 0; int ret = 0;
//piCoutObj << "open device" << path(); //piCoutObj << "open device" << path();
PRIVATE->fd = ::open(path().dataAscii(), O_RDWR); PRIVATE->fd = ::open(path().dataAscii(), O_RDWR);
@@ -86,7 +86,7 @@ bool PISPI::openDevice() {
bool PISPI::closeDevice() { bool PISPI::closeDevice() {
#ifdef PISPI #ifdef PIP_SPI
if (PRIVATE->fd) ::close(PRIVATE->fd); if (PRIVATE->fd) ::close(PRIVATE->fd);
#endif #endif
return true; return true;
@@ -102,7 +102,7 @@ int PISPI::readDevice(void * read_to, int max_size) {
int PISPI::writeDevice(const void * data, int max_size) { int PISPI::writeDevice(const void * data, int max_size) {
#ifdef PISPI #ifdef PIP_SPI
if (max_size > 0) { if (max_size > 0) {
if (tx_buf.size_s() != max_size) { if (tx_buf.size_s() != max_size) {
tx_buf.resize(max_size); tx_buf.resize(max_size);