summaryrefslogtreecommitdiff
path: root/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch')
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
new file mode 100644
index 000000000000..75d3820dad81
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
@@ -0,0 +1,32 @@
+--- xoscope-2.0/comedi.c
++++ xoscope-2.0/comedi.c
+@@ -27,7 +27,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <sys/poll.h>
+-#include <asm/page.h>
++//#include <asm/page.h>
+ #include <comedilib.h>
+ #include "oscope.h" /* program defaults */
+ #include "func.h"
+@@ -184,7 +184,9 @@
+ * avoid the bug. This is the only reason we need <asm/page.h> in
+ * our include list.
+ */
+- comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
++ //comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
++ comedi_bufsize = (comedi_bufsize + sysconf(_SC_PAGE_SIZE) - 1) &
++ (sysconf(_SC_PAGE_SIZE) - 1);
+ ret = comedi_set_buffer_size(comedi_dev, comedi_subdevice, comedi_bufsize);
+ if (ret < 0) {
+ comedi_error = comedi_errno();
+@@ -505,7 +507,7 @@
+ unsigned int chan;
+ int ret;
+
+- ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0);
++ ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0, 1);
+
+ if (ret >= 0) {
+ chan = CR_PACK(4,0,AREF_DIFF);
+