From 5065a96db886a6e2b4a44cc5eb3b31e4c40ccea8 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 17 Mar 2006 02:41:47 +0000 Subject: cleaned things up for the Pd-extended build system, it shouldn't break anything, simple things svn path=/trunk/externals/hardware/; revision=4717 --- multio/Makefile | 15 +++++--- multio/help-multio.pd | 95 --------------------------------------------------- multio/multio-help.pd | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ multio/multio.c | 12 +++---- multio/multio.libs | 1 + 5 files changed, 112 insertions(+), 106 deletions(-) delete mode 100755 multio/help-multio.pd create mode 100644 multio/multio-help.pd create mode 100644 multio/multio.libs diff --git a/multio/Makefile b/multio/Makefile index 9f79bae..729d964 100755 --- a/multio/Makefile +++ b/multio/Makefile @@ -3,6 +3,8 @@ CSYM=multio current: pd_linux +pd_src = ../../../pd + # ----------------------- NT ----------------------- pd_nt: $(NAME).dll @@ -39,7 +41,7 @@ LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) -LINUXINCLUDE = -I../../src +LINUXINCLUDE = -I../../src -I$(pd_src)/src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c @@ -53,12 +55,15 @@ pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin -DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ - -Wno-unused -Wno-parentheses -Wno-switch +DARWINCFLAGS = -DPD -O2 -Wall -W + +DARWININCLUDE = -I../../src -I$(pd_src)/src -I/sw/include +DARWINLIBS = -L/sw/lib -lusb .c.pd_darwin: - $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c - $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o + $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -o $*.o -c $*.c + $(CC) -bundle -bundle_loader $(pd_src)/bin/pd $(DARWINLIBS) \ + -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- diff --git a/multio/help-multio.pd b/multio/help-multio.pd deleted file mode 100755 index eaae25b..0000000 --- a/multio/help-multio.pd +++ /dev/null @@ -1,95 +0,0 @@ -#N canvas 112 95 1011 631 12; -#X obj 132 124 tgl 30 0 empty empty empty 0 -6 0 8 -62784 -1 -1 0 1 -; -#X obj 506 210 unpack f f; -#X floatatom 421 247 5 0 0 0 - - -; -#X floatatom 499 248 5 0 0 0 - - -; -#X msg 132 161 open; -#X obj 132 202 multio; -#X msg 132 69 readout_time 20; -#X msg 132 98 readout_time 1000; -#X msg 132 25 readout_time 1; -#X text 185 163 <-- open the device (opened by default if possible) -; -#X text 170 132 <-- start/stop readout of the device (on by default) -; -#X text 290 39 <--+ | <--+-> set the time between readouts (msec) | -20 msec is the default <--+; -#X obj 123 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 59 1; -#X obj 154 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 198 1; -#X obj 185 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 177 1; -#X obj 216 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 155 1; -#X obj 247 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 3 1; -#X obj 278 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 0 1; -#X obj 309 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 186 1; -#X obj 340 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 769 1; -#X obj 371 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 353 1; -#X obj 402 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 1659 1; -#X obj 433 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 --1 -1 1380 1; -#X obj 123 274 route 0 1 2 3 4 5 6 7 8 9 10; -#X obj 433 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 445 256; -#X obj 402 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 535 256; -#X obj 371 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 114 256; -#X obj 340 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 248 256; -#X obj 309 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 60 256; -#X obj 278 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 0 256; -#X obj 247 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 1 256; -#X obj 216 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 50 256; -#X obj 185 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 57 256; -#X obj 154 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 64 256; -#X obj 123 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 -14 -262144 -1 -1 19 256; -#X msg 130 46 readout_time 5; -#X connect 0 0 5 0; -#X connect 1 0 2 0; -#X connect 1 1 3 0; -#X connect 4 0 5 0; -#X connect 5 0 23 0; -#X connect 5 1 1 0; -#X connect 6 0 5 0; -#X connect 7 0 5 0; -#X connect 8 0 5 0; -#X connect 23 0 34 0; -#X connect 23 1 33 0; -#X connect 23 2 32 0; -#X connect 23 3 31 0; -#X connect 23 4 30 0; -#X connect 23 5 29 0; -#X connect 23 6 28 0; -#X connect 23 7 27 0; -#X connect 23 8 26 0; -#X connect 23 9 25 0; -#X connect 23 10 24 0; -#X connect 24 0 22 0; -#X connect 25 0 21 0; -#X connect 26 0 20 0; -#X connect 27 0 19 0; -#X connect 28 0 18 0; -#X connect 29 0 17 0; -#X connect 30 0 16 0; -#X connect 31 0 15 0; -#X connect 32 0 14 0; -#X connect 33 0 13 0; -#X connect 34 0 12 0; -#X connect 35 0 5 0; diff --git a/multio/multio-help.pd b/multio/multio-help.pd new file mode 100644 index 0000000..eaae25b --- /dev/null +++ b/multio/multio-help.pd @@ -0,0 +1,95 @@ +#N canvas 112 95 1011 631 12; +#X obj 132 124 tgl 30 0 empty empty empty 0 -6 0 8 -62784 -1 -1 0 1 +; +#X obj 506 210 unpack f f; +#X floatatom 421 247 5 0 0 0 - - -; +#X floatatom 499 248 5 0 0 0 - - -; +#X msg 132 161 open; +#X obj 132 202 multio; +#X msg 132 69 readout_time 20; +#X msg 132 98 readout_time 1000; +#X msg 132 25 readout_time 1; +#X text 185 163 <-- open the device (opened by default if possible) +; +#X text 170 132 <-- start/stop readout of the device (on by default) +; +#X text 290 39 <--+ | <--+-> set the time between readouts (msec) | +20 msec is the default <--+; +#X obj 123 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 59 1; +#X obj 154 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 198 1; +#X obj 185 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 177 1; +#X obj 216 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 155 1; +#X obj 247 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 3 1; +#X obj 278 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 0 1; +#X obj 309 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 186 1; +#X obj 340 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 769 1; +#X obj 371 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 353 1; +#X obj 402 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 1659 1; +#X obj 433 357 vsl 30 128 0 4096 0 0 empty empty empty 0 -8 0 8 -128992 +-1 -1 1380 1; +#X obj 123 274 route 0 1 2 3 4 5 6 7 8 9 10; +#X obj 433 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 445 256; +#X obj 402 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 535 256; +#X obj 371 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 114 256; +#X obj 340 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 248 256; +#X obj 309 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 60 256; +#X obj 278 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 0 256; +#X obj 247 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 1 256; +#X obj 216 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 50 256; +#X obj 185 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 57 256; +#X obj 154 330 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 64 256; +#X obj 123 311 nbx 4 16 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 +14 -262144 -1 -1 19 256; +#X msg 130 46 readout_time 5; +#X connect 0 0 5 0; +#X connect 1 0 2 0; +#X connect 1 1 3 0; +#X connect 4 0 5 0; +#X connect 5 0 23 0; +#X connect 5 1 1 0; +#X connect 6 0 5 0; +#X connect 7 0 5 0; +#X connect 8 0 5 0; +#X connect 23 0 34 0; +#X connect 23 1 33 0; +#X connect 23 2 32 0; +#X connect 23 3 31 0; +#X connect 23 4 30 0; +#X connect 23 5 29 0; +#X connect 23 6 28 0; +#X connect 23 7 27 0; +#X connect 23 8 26 0; +#X connect 23 9 25 0; +#X connect 23 10 24 0; +#X connect 24 0 22 0; +#X connect 25 0 21 0; +#X connect 26 0 20 0; +#X connect 27 0 19 0; +#X connect 28 0 18 0; +#X connect 29 0 17 0; +#X connect 30 0 16 0; +#X connect 31 0 15 0; +#X connect 32 0 14 0; +#X connect 33 0 13 0; +#X connect 34 0 12 0; +#X connect 35 0 5 0; diff --git a/multio/multio.c b/multio/multio.c index 65c1ac5..9238974 100755 --- a/multio/multio.c +++ b/multio/multio.c @@ -9,9 +9,9 @@ output is a list of 2 floats (channel, value) */ -#ifdef NT -#include -#endif +#ifdef _WIN32 +#include +#endif /* _WIN32 */ #include "m_pd.h" #include "usb.h" @@ -73,7 +73,7 @@ static void *usb_read_thread(void *w) bytesread = usb_interrupt_read(x->d, 0x81, buffer, 8, 1000); if(bytesread > 0) { - if(x->buf_count[mybuf]+bytesread > MAXBUF) + if(x->buf_count[mybuf]+bytesread > MAXBUF) x->buf_count[mybuf] = 0; x->double_buffer[mybuf][x->buf_count[mybuf]++] = bytesread; // store the number of bytes for that message for(cnt = 0; cnt < bytesread; cnt++) // append the message data into the buffer @@ -83,9 +83,9 @@ static void *usb_read_thread(void *w) // post("thread read %i bytes to buffer %i (now %i bytes)",bytesread, mybuf,x->buf_count[mybuf] ); } } -#ifdef NT +#ifdef _WIN32 Sleep(1); -#endif +#endif /* _WIN32 */ } } diff --git a/multio/multio.libs b/multio/multio.libs new file mode 100644 index 0000000..d567bab --- /dev/null +++ b/multio/multio.libs @@ -0,0 +1 @@ +-lusb -- cgit v1.2.1