Skip to contentSkip to conversation

usx2yloader hotplugging in HEAD

PATCH In review Karsten Wiese 3 participants 6 messages Dec 2, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usx2yloader hotplugging in HEAD

Hi Takashi,

Please commit this to reenable usx2yloader hotplugging:

Quoted 1 line
Quoted 1 line
Quoted 1 line

Index: alsa-tools/usx2yloader/tascam_fw
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/usx2yloader/tascam_fw,v retrieving revision 1.1

usx2yloader/tascam_fw +1 -1
diff -u -r1.1 tascam_fw
@@ -3,7 +3,7 @@
 # load the firmware into Tascam USB devices
 
 FIRMWARE=
-FIRMWAREDIR=/usr/local/share/alsa/firmware
+FIRMWAREDIR=/usr/local/share/alsa/firmware/usx2yloader
 FLAGS=
 LOADER=/sbin/fxload
 LOADERFIRMWARE=$FIRMWAREDIR/tascam_loader.ihx

<<<

Later there should also be some magic to (not) include the "/local" substring, I don't know yet how to do that; anybody?

Thanks,
Karsten

-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/

#1 lore raw

At Tue, 2 Dec 2003 09:31:32 +0100,

Quoted 23 lines · Karsten Wiese

Hi Takashi,

Please commit this to reenable usx2yloader hotplugging:

Quoted 1 line
Quoted 1 line
Quoted 1 line

Index: alsa-tools/usx2yloader/tascam_fw
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/usx2yloader/tascam_fw,v retrieving revision 1.1
diff -u -r1.1 tascam_fw

usx2yloader/tascam_fw +1 -1
@@ -3,7 +3,7 @@
 # load the firmware into Tascam USB devices
 
 FIRMWARE=
-FIRMWAREDIR=/usr/local/share/alsa/firmware
+FIRMWAREDIR=/usr/local/share/alsa/firmware/usx2yloader
 FLAGS=
 LOADER=/sbin/fxload
 LOADERFIRMWARE=$FIRMWAREDIR/tascam_loader.ihx

<<<

Quoted 2 lines

Later there should also be some magic to (not) include the "/local" substring, I don't know yet how to do that; anybody?

fixed on cvs.
tascam_fw and tascam_fpga will be generated via configure script now. the diff is attached below. please give a try.

Takashi

Index: alsa-tools/usx2yloader/.cvsignore
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-tools/usx2yloader/.cvsignore,v retrieving revision 1.1
retrieving revision 1.2

usx2yloader/.cvsignore +2 -0
diff -u -r1.1 -r1.2
@@ -12,3 +12,5 @@
 depcomp
 .deps
 autom4te.cache
+tascam_fpga
+tascam_fw

Index: alsa-tools/usx2yloader/Makefile.am
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-tools/usx2yloader/Makefile.am,v retrieving revision 1.6
retrieving revision 1.7

usx2yloader/Makefile.am +1 -1
diff -u -r1.6 -r1.7
@@ -9,7 +9,7 @@
 
 usx2yloader_SOURCES = usx2yloader.c
 
-EXTRA_DIST = depcomp tascam_fw.usermap tascam_fw tascam_fpga
+EXTRA_DIST = depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
 
 hotplug_files = tascam_fw.usermap tascam_fw tascam_fpga
 hotplugdir = /etc/hotplug/usb

Index: alsa-tools/usx2yloader/configure.in
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-tools/usx2yloader/configure.in,v retrieving revision 1.3
retrieving revision 1.4

usx2yloader/configure.in +1 -1
diff -u -r1.3 -r1.4
@@ -8,4 +8,4 @@
 CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile tascam_fpga tascam_fw)

Index: alsa-tools/usx2yloader/tascam_fpga.in
===================================================================
RCS file: alsa-tools/usx2yloader/tascam_fpga.in

usx2yloader/tascam_fpga.in new file +18 -0
diff -N alsa-tools/usx2yloader/tascam_fpga.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+# load the firmware into Tascam USB devices (FPGA design)
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+
+LOADER=@bindir@/usx2yloader
+
+if [ -x /usr/bin/logger ]; then
+	/usr/bin/logger -t $0 "calling $LOADER for $DEVICE"
+fi
+$LOADER
+@bin@/us428control &
+if [ -x /usr/bin/logger ]; then
+	/usr/bin/logger -t $0 "leaving"
+fi
+
+exit 0

Index: alsa-tools/usx2yloader/tascam_fw.in
===================================================================
RCS file: alsa-tools/usx2yloader/tascam_fw.in

usx2yloader/tascam_fw.in new file +60 -0

60 lines not on this page · raw message

#2 lore raw
Quoted 7 lines · Takashi Iwai
Quoted 3 lines · Karsten Wiese

Later there should also be some magic to (not) include the "/local" substring, I don't know yet how to do that; anybody?

fixed on cvs.
tascam_fw and tascam_fpga will be generated via configure script now.

Such scripts should not be generated by configure but by the Makefile. For the reason and an example, see
http://www.gnu.org/software/autoconf/manual/autoconf-2.57/html_node/autoconf_24.html

Regards,
Clemens

-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/

#3 lore raw

At Tue, 02 Dec 2003 11:35:47 +0100 (MET),

Quoted 8 lines · Clemens Ladisch
Quoted 5 lines · Takashi Iwai
Quoted 3 lines · Karsten Wiese

Later there should also be some magic to (not) include the "/local" substring, I don't know yet how to do that; anybody?

Quoted 6 lines
Quoted 2 lines

fixed on cvs.
tascam_fw and tascam_fpga will be generated via configure script now.

Such scripts should not be generated by configure but by the Makefile. For the reason and an example, see
http://www.gnu.org/software/autoconf/manual/autoconf-2.57/html_node/autoconf_24.html

well, it means that the direct use $datadir is not adequet for C, etc. but for shell script it's ok - although it'd be better to define such a path explicitly. i'll work on it.

Takashi

-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/

#4 lore raw

At Tue, 02 Dec 2003 11:39:52 +0100,

Quoted 14 lines · I wrote:

At Tue, 02 Dec 2003 11:35:47 +0100 (MET),

Quoted 11 lines · Clemens Ladisch
Quoted 7 lines · Takashi Iwai
Quoted 3 lines · Karsten Wiese

Later there should also be some magic to (not) include the "/local" substring, I don't know yet how to do that; anybody?

fixed on cvs.
tascam_fw and tascam_fpga will be generated via configure script now.

Quoted 7 lines
Quoted 3 lines

Such scripts should not be generated by configure but by the Makefile. For the reason and an example, see
http://www.gnu.org/software/autoconf/manual/autoconf-2.57/html_node/autoconf_24.html

well, it means that the direct use $datadir is not adequet for C, etc. but for shell script it's ok - although it'd be better to define such a path explicitly. i'll work on it.

it turned out that we need define $bindir too.
but i don't think it's worthy to add extra options for that. so, i think the current style is ok.

Takashi

-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/

#5 lore raw
In reply to Takashi Iwai

Am Dienstag, 2. Dezember 2003 11:05 schrieb Takashi Iwai:

Quoted 7 lines

At Tue, 2 Dec 2003 09:31:32 +0100,

fixed on cvs.
tascam_fw and tascam_fpga will be generated via configure script now. the diff is attached below. please give a try.

Tried succesfully!

Thanks,
Karsten

-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/