Merge pull request #3 from eddelbuettel/master

Change to enable build

.Rbuildignore

@@ -11,3 +11,4 @@
 ^doc$
 ^Meta$
 ^data-raw$
+^src/spidev-lib-master/build

R/RcppExports.R

@@ -1,7 +1,7 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-rpi_spi_open <- function(*device, config) {
-    .Call(`_rpigpior_rpi_spi_open`, *device, config)
+rpi_spi_open <- function(dev) {
+    .Call(`_rpigpior_rpi_spi_open`, dev)
 }
 

src/Makevars

@@ -1 +1 @@
-PKG_LIBS = -llibspidev-lib.a
+PKG_LIBS = -L. -lspidev-lib++

src/RcppExports.cpp

@@ -11,20 +11,19 @@ Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
 #endif
 
 // rpi_spi_open
-int rpi_spi_open(char *device, spi_config_t config);
-RcppExport SEXP _rpigpior_rpi_spi_open(SEXP *deviceSEXP, SEXP configSEXP) {
+int rpi_spi_open(std::string dev);
+RcppExport SEXP _rpigpior_rpi_spi_open(SEXP devSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< char >::type *device(*deviceSEXP);
-    Rcpp::traits::input_parameter< spi_config_t >::type config(configSEXP);
-    rcpp_result_gen = Rcpp::wrap(rpi_spi_open(*device, config));
+    Rcpp::traits::input_parameter< std::string >::type dev(devSEXP);
+    rcpp_result_gen = Rcpp::wrap(rpi_spi_open(dev));
     return rcpp_result_gen;
 END_RCPP
 }
 
 static const R_CallMethodDef CallEntries[] = {
-    {"_rpigpior_rpi_spi_open", (DL_FUNC) &_rpigpior_rpi_spi_open, 2},
+    {"_rpigpior_rpi_spi_open", (DL_FUNC) &_rpigpior_rpi_spi_open, 1},
     {NULL, NULL, 0}
 };
 

src/rpi_spi_open.cpp

@@ -1,4 +1,4 @@
-# https://github.com/milekium/spidev-lib
+// https://github.com/milekium/spidev-lib
 
 #include <Rcpp.h>
 #include <stdio.h>
@@ -15,9 +15,11 @@
 #include "spidev_lib.h"
 
 using namespace Rcpp;
-// [[Rcpp::export]]
 
-int rpi_spi_open(char *device, spi_config_t config) {
+// [[Rcpp::export]]
+int rpi_spi_open(std::string dev) {
+    const char *device = dev.c_str();
+    spi_config_t config;
     int fd;
 
     /* Open block device */