alsa: hdsp - allow proc reporting with disconnected io box
PATCH 1/1 alsa: hdsp - allow proc reporting with disconnected io box
the hdsp driver refuses to report any information via the proc interface, if the io box is not connected. with this patch, the content of the control and status registers is printed before the iobox check.
--- sound/pci/rme9652/hdsp.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-)
sound/pci/rme9652/hdsp.c +20 -17
@@ -3357,17 +3357,33 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)char *clock_source;int x; + status =hdsp_read (hdsp, HDSP_statusRegister); + status2 =hdsp_read (hdsp, HDSP_status2Register); +snd_iprintf (buffer,"%s (Card #%d)\n" , hdsp->card_name, + hdsp->card->number +1 ); +snd_iprintf (buffer,"Buffers: capture %p playback %p\n" , + hdsp->capture_buffer, hdsp->playback_buffer); +snd_iprintf (buffer,"IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n" , + hdsp->irq, hdsp->port, (unsigned long )hdsp->iobase); +snd_iprintf (buffer,"Control register: 0x%x\n" , hdsp->control_register); +snd_iprintf (buffer,"Control2 register: 0x%x\n" , + hdsp->control2_register); +snd_iprintf (buffer,"Status register: 0x%x\n" , status); +snd_iprintf (buffer,"Status2 register: 0x%x\n" , status2); -if (hdsp_check_for_iobox (hdsp)) { -snd_iprintf (buffer,"No I/O box connected.\nPlease connect one and upload firmware.\n" ); +if (hdsp_check_for_iobox (hdsp)) { +snd_iprintf (buffer,"No I/O box connected.\n" +"Please connect one and upload firmware.\n" );return ; - } + }if (hdsp_check_for_firmware (hdsp,0 )) {if (hdsp->state & HDSP_FirmwareCached) {if (snd_hdsp_load_firmware_from_cache (hdsp) !=0 ) { -snd_iprintf (buffer,"Firmware loading from cache failed, please upload manually.\n" ); +snd_iprintf (buffer,"Firmware loading from " +"cache failed, " +"please upload manually.\n" );return ; } }else {
@@ -3384,18 +3400,6 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) } } - status =hdsp_read (hdsp, HDSP_statusRegister); - status2 =hdsp_read (hdsp, HDSP_status2Register); - -snd_iprintf (buffer,"%s (Card #%d)\n" , hdsp->card_name, hdsp->card->number +1 ); -snd_iprintf (buffer,"Buffers: capture %p playback %p\n" , - hdsp->capture_buffer, hdsp->playback_buffer); -snd_iprintf (buffer,"IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n" , - hdsp->irq, hdsp->port, (unsigned long )hdsp->iobase); -snd_iprintf (buffer,"Control register: 0x%x\n" , hdsp->control_register); -snd_iprintf (buffer,"Control2 register: 0x%x\n" , hdsp->control2_register); -snd_iprintf (buffer,"Status register: 0x%x\n" , status); -snd_iprintf (buffer,"Status2 register: 0x%x\n" , status2);snd_iprintf (buffer,"FIFO status: %d\n" ,hdsp_read (hdsp, HDSP_fifoStatus) &0xff );snd_iprintf (buffer,"MIDI1 Output status: 0x%x\n" ,hdsp_read (hdsp, HDSP_midiStatusOut0));snd_iprintf (buffer,"MIDI1 Input status: 0x%x\n" ,hdsp_read (hdsp, HDSP_midiStatusIn0));
@@ -3416,7 +3420,6 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)snd_iprintf (buffer,"\n" ); -switch (hdsp_clock_source (hdsp)) {case HDSP_CLOCK_SOURCE_AUTOSYNC : clock_source ="AutoSync" ;
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
At Wed, 12 Aug 2009 13:00:13 +0200,
Quoted 7 lines · Tim Blechmann
the hdsp driver refuses to report any information via the proc interface, if the io box is not connected. with this patch, the content of the control and status registers is printed before the iobox check.
Signed-off-by Tim Blechmann <[email protected]>
Your patch can't be cleanly applied. Could you regenerate based on the latest sound git tree?
thanks,
Takashi
PATCH v2 1/1 alsa: hdsp - allow proc reporting with disconnected io box
here you go ...
--
the hdsp driver refuses to report any information via the proc interface, if the io box is not connected. with this patch, the content of the control and status registers is printed before the iobox check.
v2: rebased against sound-2.6/master
--- sound/pci/rme9652/hdsp.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-)
sound/pci/rme9652/hdsp.c +22 -17
@@ -3294,15 +3294,33 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)char *clock_source;int x; -if (hdsp_check_for_iobox (hdsp)) { -snd_iprintf (buffer,"No I/O box connected.\nPlease connect one and upload firmware.\n" ); + status =hdsp_read (hdsp, HDSP_statusRegister); + status2 =hdsp_read (hdsp, HDSP_status2Register); + +snd_iprintf (buffer,"%s (Card #%d)\n" , hdsp->card_name, + hdsp->card->number +1 ); +snd_iprintf (buffer,"Buffers: capture %p playback %p\n" , + hdsp->capture_buffer, hdsp->playback_buffer); +snd_iprintf (buffer,"IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n" , + hdsp->irq, hdsp->port, (unsigned long )hdsp->iobase); +snd_iprintf (buffer,"Control register: 0x%x\n" , hdsp->control_register); +snd_iprintf (buffer,"Control2 register: 0x%x\n" , + hdsp->control2_register); +snd_iprintf (buffer,"Status register: 0x%x\n" , status); +snd_iprintf (buffer,"Status2 register: 0x%x\n" , status2); + +if (hdsp_check_for_iobox (hdsp)) { +snd_iprintf (buffer,"No I/O box connected.\n" +"Please connect one and upload firmware.\n" );return ; - } + }if (hdsp_check_for_firmware (hdsp,0 )) {if (hdsp->state & HDSP_FirmwareCached) {if (snd_hdsp_load_firmware_from_cache (hdsp) !=0 ) { -snd_iprintf (buffer,"Firmware loading from cache failed, please upload manually.\n" ); +snd_iprintf (buffer,"Firmware loading from " +"cache failed, " +"please upload manually.\n" );return ; } }else {
@@ -3319,18 +3337,6 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) } } - status =hdsp_read (hdsp, HDSP_statusRegister); - status2 =hdsp_read (hdsp, HDSP_status2Register); - -snd_iprintf (buffer,"%s (Card #%d)\n" , hdsp->card_name, hdsp->card->number +1 ); -snd_iprintf (buffer,"Buffers: capture %p playback %p\n" , - hdsp->capture_buffer, hdsp->playback_buffer); -snd_iprintf (buffer,"IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n" , - hdsp->irq, hdsp->port, (unsigned long )hdsp->iobase); -snd_iprintf (buffer,"Control register: 0x%x\n" , hdsp->control_register); -snd_iprintf (buffer,"Control2 register: 0x%x\n" , hdsp->control2_register); -snd_iprintf (buffer,"Status register: 0x%x\n" , status); -snd_iprintf (buffer,"Status2 register: 0x%x\n" , status2);snd_iprintf (buffer,"FIFO status: %d\n" ,hdsp_read (hdsp, HDSP_fifoStatus) &0xff );snd_iprintf (buffer,"MIDI1 Output status: 0x%x\n" ,hdsp_read (hdsp, HDSP_midiStatusOut0));snd_iprintf (buffer,"MIDI1 Input status: 0x%x\n" ,hdsp_read (hdsp, HDSP_midiStatusIn0));
@@ -3351,7 +3357,6 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)snd_iprintf (buffer,"\n" ); -switch (hdsp_clock_source (hdsp)) {case HDSP_CLOCK_SOURCE_AUTOSYNC : clock_source ="AutoSync" ;
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
At Wed, 12 Aug 2009 18:12:43 +0200,
Quoted 9 lines · Tim Blechmann
here you go ...
--
the hdsp driver refuses to report any information via the proc interface, if the io box is not connected. with this patch, the content of the control and status registers is printed before the iobox check.
Quoted 3 lines
v2: rebased against sound-2.6/master
Signed-off-by Tim Blechmann <[email protected]>
OK, applied now. Thanks!
Takashi