i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmedia: update to newer spinlock API.

Browse Source
This commit is contained in:
Augustin Cavalier
2015-06-28 14:32:57 -04:00
parent 37248a2fff
commit 8306064d44
3 changed files with 72 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/cmedia/cm.c
-2
View File
@@ -9,9 +9,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#if !defined(_KERNEL_EXPORT_H)
#include <KernelExport.h> #include <KernelExport.h>
#endif
#if DEBUG #if DEBUG
src/add-ons/kernel/drivers/audio/cmedia/cm_private.h
+11 -14
View File
@@ -6,13 +6,10 @@
#if !defined(_CM_PRIVATE_H) #if !defined(_CM_PRIVATE_H)
#define _CM_PRIVATE_H #define _CM_PRIVATE_H
#if !defined(_CMEDIA_PCI_H)
#include "cmedia_pci.h" #include "cmedia_pci.h"
#endif
#if !defined(_PCI_H) #include <KernelExport.h>
#include <PCI.h> #include <PCI.h>
#endif
#if !defined(DEBUG) #if !defined(DEBUG)
#define DEBUG 0 #define DEBUG 0
@@ -54,7 +51,7 @@
/* there are five logical devices: midi, joystick, pcm, mux and mixer */ /* there are five logical devices: midi, joystick, pcm, mux and mixer */
typedef struct _midi_dev typedef struct _midi_dev
{ {
struct _cmedia_pci_dev *card; struct _cmedia_pci_dev *card;
void * driver; void * driver;
@@ -63,7 +60,7 @@ typedef struct _midi_dev
char name[64]; char name[64];
} midi_dev; } midi_dev;
typedef struct _joy_dev typedef struct _joy_dev
{ {
void * driver; void * driver;
char name1[64]; char name1[64];
@@ -72,13 +69,13 @@ typedef struct _joy_dev
typedef cmedia_pci_audio_format pcm_cfg; typedef cmedia_pci_audio_format pcm_cfg;
typedef cmedia_pci_audio_buf_header pcm_buf_hdr; typedef cmedia_pci_audio_buf_header pcm_buf_hdr;
enum enum
{ /* these map to the mode enable bits in the CMX13 register */ { /* these map to the mode enable bits in the CMX13 register */
kPlayback = 1, kPlayback = 1,
kRecord = 2 kRecord = 2
}; };
typedef struct typedef struct
{ {
struct _cmedia_pci_dev * card; struct _cmedia_pci_dev * card;
char name[DEVNAME]; char name[DEVNAME];
@@ -89,7 +86,7 @@ typedef struct
/* playback from a cyclic, small-ish buffer */ /* playback from a cyclic, small-ish buffer */
int32 wr_lock; spinlock wr_lock;
int dma_a; int dma_a;
vuchar * wr_1; vuchar * wr_1;
vuchar * wr_2; vuchar * wr_2;
@@ -108,7 +105,7 @@ typedef struct
/* recording into a cyclic, somewhat larger buffer */ /* recording into a cyclic, somewhat larger buffer */
int32 rd_lock; spinlock rd_lock;
int dma_c; int dma_c;
vuchar * rd_1; vuchar * rd_1;
vuchar * rd_2; vuchar * rd_2;
@@ -133,24 +130,24 @@ typedef struct
sem_id old_play_sem; sem_id old_play_sem;
} pcm_dev; } pcm_dev;
typedef struct typedef struct
{ {
struct _cmedia_pci_dev * card; struct _cmedia_pci_dev * card;
char name[DEVNAME]; char name[DEVNAME];
int32 open_count; int32 open_count;
} mux_dev; } mux_dev;
typedef struct typedef struct
{ {
struct _cmedia_pci_dev * card; struct _cmedia_pci_dev * card;
char name[DEVNAME]; char name[DEVNAME];
int32 open_count; int32 open_count;
} mixer_dev; } mixer_dev;
typedef struct _cmedia_pci_dev typedef struct _cmedia_pci_dev
{ {
char name[DEVNAME]; /* used for resources */ char name[DEVNAME]; /* used for resources */
int32 hardware; /* spinlock */ spinlock hardware;
int enhanced; /* offset to port */ int enhanced; /* offset to port */
int32 inth_count; int32 inth_count;
int dma_base; int dma_base;
src/add-ons/kernel/drivers/audio/cmedia/pcm.c
+61 -64
View File
@@ -10,9 +10,7 @@
#include "cm_private.h" #include "cm_private.h"
#include "sound.h" #include "sound.h"
#if !defined(_KERNEL_EXPORT_H)
#include <KernelExport.h> #include <KernelExport.h>
#endif /* _KERNEL_EXPORT_H */
extern int sprintf(char *, const char *, ...); extern int sprintf(char *, const char *, ...);
@@ -88,7 +86,7 @@ device_hooks pcm_hooks = {
static pcm_cfg default_pcm = { static pcm_cfg default_pcm = {
44100.0, /* sample rate */ 44100.0, /* sample rate */
2, /* channels */ 2, /* channels */
0x2, /* format */ 0x2, /* format */
#if B_HOST_IS_BENDIAN #if B_HOST_IS_BENDIAN
1, /* endian (big) */ 1, /* endian (big) */
#else #else
@@ -176,11 +174,11 @@ start_dma(
KTRACE(); KTRACE();
ddprintf(("cmedia_pci: start_dma()\n")); ddprintf(("cmedia_pci: start_dma()\n"));
if (port->config.format == 0x11) { if (port->config.format == 0x11) {
memset((void*)port->card->low_mem, 0x80, port->config.play_buf_size + memset((void*)port->card->low_mem, 0x80, port->config.play_buf_size +
port->config.rec_buf_size); port->config.rec_buf_size);
} }
else { else {
memset((void *)port->card->low_mem, 0, port->config.play_buf_size + memset((void *)port->card->low_mem, 0, port->config.play_buf_size +
port->config.rec_buf_size); port->config.rec_buf_size);
} }
@@ -201,8 +199,8 @@ start_dma(
/* will get 187 interrupts a second from playback, and 94 interrupts */ /* will get 187 interrupts a second from playback, and 94 interrupts */
/* a second from recording, at 48 kHz sampling rate, when buffers */ /* a second from recording, at 48 kHz sampling rate, when buffers */
/* are 2048 for playback and 4096 for record. */ /* are 2048 for playback and 4096 for record. */
ddprintf(("play_buf_size %lx rec_buf_size %lx\n", ddprintf(("play_buf_size %lx rec_buf_size %lx\n",
port->config.play_buf_size/2, port->config.rec_buf_size/2)); port->config.play_buf_size/2, port->config.rec_buf_size/2));
PCI_IO_WR(port->dma_c, ((uint32)port->card->low_phys+ PCI_IO_WR(port->dma_c, ((uint32)port->card->low_phys+
@@ -246,7 +244,7 @@ start_dma(
} }
static status_t static status_t
configure_pcm( configure_pcm(
pcm_dev * port, pcm_dev * port,
pcm_cfg * config, pcm_cfg * config,
@@ -274,7 +272,7 @@ configure_pcm(
} }
/* secret format of format: upper nybble = signed, unsigned, float */ /* secret format of format: upper nybble = signed, unsigned, float */
/* lower nybble = bytes per sample */ /* lower nybble = bytes per sample */
if ((config->format != 0x11) && (config->format != 0x2) && if ((config->format != 0x11) && (config->format != 0x2) &&
(config->format != 0x24) && (config->format != 0x4)) { (config->format != 0x24) && (config->format != 0x4)) {
config->format = default_pcm.format; config->format = default_pcm.format;
} }
@@ -427,7 +425,7 @@ configure_pcm(
/* here is where we should care about record and playback buffer sizes */ /* here is where we should care about record and playback buffer sizes */
ddprintf(("cmedia_pci: play %04lx rec %04lx\n", port->config.play_buf_size/2, ddprintf(("cmedia_pci: play %04lx rec %04lx\n", port->config.play_buf_size/2,
port->config.rec_buf_size/2)); port->config.rec_buf_size/2));
port->wr_1 = port->card->low_mem; port->wr_1 = port->card->low_mem;
@@ -499,8 +497,7 @@ gotit:
port->config.rec_buf_size *= 2; port->config.rec_buf_size *= 2;
/* playback */ /* playback */
B_INITIALIZE_SPINLOCK(&port->wr_lock);
port->wr_lock = 0;
port->dma_a = cards[ix].dma_base; port->dma_a = cards[ix].dma_base;
port->wr_1 = cards[ix].low_mem; port->wr_1 = cards[ix].low_mem;
port->wr_2 = cards[ix].low_mem+port->config.play_buf_size/2; port->wr_2 = cards[ix].low_mem+port->config.play_buf_size/2;
@@ -532,10 +529,10 @@ gotit:
return port->wr_time_sem; return port->wr_time_sem;
} }
set_sem_owner(port->wr_time_sem, B_SYSTEM_TEAM); set_sem_owner(port->wr_time_sem, B_SYSTEM_TEAM);
/* recording */ /* recording */
port->rd_lock = 0; B_INITIALIZE_SPINLOCK(&port->rd_lock);
port->dma_c = cards[ix].dma_base+0x08; port->dma_c = cards[ix].dma_base+0x08;
port->rd_1 = cards[ix].low_mem+port->config.play_buf_size; port->rd_1 = cards[ix].low_mem+port->config.play_buf_size;
port->rd_2 = cards[ix].low_mem+port->config.play_buf_size+port->config.rec_buf_size/2; port->rd_2 = cards[ix].low_mem+port->config.play_buf_size+port->config.rec_buf_size/2;
@@ -595,7 +592,7 @@ gotit:
set_direct(port->card, 0x0e, 0x03, 0x03); /* */ set_direct(port->card, 0x0e, 0x03, 0x03); /* */
start_dma(port); start_dma(port);
/* initialization is done, let other clients of the driver go */ /* initialization is done, let other clients of the driver go */
} else { } else {
if (prev_mode != port->open_mode) { if (prev_mode != port->open_mode) {
@@ -690,9 +687,9 @@ pcm_free(
KTRACE(); KTRACE();
cp = disable_interrupts(); cp = disable_interrupts();
acquire_spinlock(&port->card->hardware); acquire_spinlock(&port->card->hardware);
decrement_interrupt_handler(port->card); decrement_interrupt_handler(port->card);
release_spinlock(&port->card->hardware); release_spinlock(&port->card->hardware);
restore_interrupts(cp); restore_interrupts(cp);
} }
@@ -815,73 +812,73 @@ pcm_control(
u = get_indirect(port->card, 0x30)>>2; u = get_indirect(port->card, 0x30)>>2;
sound->mono_gain = u&63; sound->mono_gain = u&63;
sound->mono_mute = 0; sound->mono_mute = 0;
/* left channel */ /* left channel */
u = get_indirect(port->card, 0x3d); // Legacy SB compatible Mixer u = get_indirect(port->card, 0x3d); // Legacy SB compatible Mixer
switch (u) switch (u)
{ {
case 0x10: case 0x10:
sound->left.adc_source = line; // record line left sound->left.adc_source = line; // record line left
break; break;
case 4: case 4:
sound->left.adc_source = aux1; // record CD left ?? sound->left.adc_source = aux1; // record CD left ??
break; break;
case 1: case 1:
sound->left.adc_source = mic; // record mic left sound->left.adc_source = mic; // record mic left
break; break;
default: default:
sound->left.adc_source = loopback; sound->left.adc_source = loopback;
break; break;
} }
u = get_indirect(port->card, 0x3f)>>4; u = get_indirect(port->card, 0x3f)>>4;
sound->left.adc_gain = u&15; sound->left.adc_gain = u&15;
u = get_direct(port->card, 0x25)<<4; u = get_direct(port->card, 0x25)<<4;
sound->left.mic_gain_enable = u&16; sound->left.mic_gain_enable = u&16;
u = get_indirect(port->card, 0x36)>>3; u = get_indirect(port->card, 0x36)>>3;
sound->left.aux1_mix_gain = 31-(u&31); sound->left.aux1_mix_gain = 31-(u&31);
u = get_indirect(port->card, 0x3c)<<5; u = get_indirect(port->card, 0x3c)<<5;
sound->left.aux1_mix_mute = ~u&128; sound->left.aux1_mix_mute = ~u&128;
u = get_indirect(port->card, 0x34)>>3; u = get_indirect(port->card, 0x34)>>3;
sound->left.aux2_mix_gain = 31-(u&31); sound->left.aux2_mix_gain = 31-(u&31);
u = get_direct(port->card, 0x24); u = get_direct(port->card, 0x24);
sound->left.aux2_mix_mute = u&128; sound->left.aux2_mix_mute = u&128;
u = get_indirect(port->card, 0x38)>>3; u = get_indirect(port->card, 0x38)>>3;
sound->left.line_mix_gain = 31-(u&31); sound->left.line_mix_gain = 31-(u&31);
u = get_indirect(port->card, 0x3c)<<3; u = get_indirect(port->card, 0x3c)<<3;
sound->left.line_mix_mute = ~u&128; sound->left.line_mix_mute = ~u&128;
u = get_indirect(port->card, 0x32)>>2; u = get_indirect(port->card, 0x32)>>2;
sound->left.dac_attn = 63-(u&63); sound->left.dac_attn = 63-(u&63);
u = get_direct(port->card, 0x24)<<1; u = get_direct(port->card, 0x24)<<1;
sound->left.dac_mute = u&128; sound->left.dac_mute = u&128;
/* right channel */ /* right channel */
u = get_indirect(port->card, 0x3e); u = get_indirect(port->card, 0x3e);
switch (u) switch (u)
{ {
case 8: case 8:
sound->right.adc_source = line; //record line right sound->right.adc_source = line; //record line right
break; break;
case 2: case 2:
sound->right.adc_source = aux1; // record CD right? sound->right.adc_source = aux1; // record CD right?
break; break;
case 1: case 1:
sound->right.adc_source = mic; // record mic right sound->right.adc_source = mic; // record mic right
break; break;
default: default:
sound->right.adc_source = loopback; sound->right.adc_source = loopback;
break; break;
@@ -961,7 +958,7 @@ pcm_control(
set_indirect(port->card, 0x30, u<<3, 0xff); set_indirect(port->card, 0x30, u<<3, 0xff);
set_indirect(port->card, 0x31, u<<3, 0xff); set_indirect(port->card, 0x31, u<<3, 0xff);
/* left channel */ /* left channel */
switch (sound->left.adc_source) switch (sound->left.adc_source)
{ {
case line: case line:
u = 1<<4; u = 1<<4;
@@ -1096,8 +1093,8 @@ pcm_control(
*(int32*)data = config.rec_buf_size; *(int32*)data = config.rec_buf_size;
err = B_OK; err = B_OK;
break; break;
// control ports for SPDIF settings // control ports for SPDIF settings
case SOUND_GET_SPDIF_IN_OUT_LOOPBACK: case SOUND_GET_SPDIF_IN_OUT_LOOPBACK:
*(int8 *)data = 0; *(int8 *)data = 0;
@@ -1105,7 +1102,7 @@ pcm_control(
if( reg_value && 0x80 ) *(int8 *)data = 1; if( reg_value && 0x80 ) *(int8 *)data = 1;
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_SPDIF_IN_OUT_LOOPBACK: case SOUND_SET_SPDIF_IN_OUT_LOOPBACK:
if( *(int8 *)data == 0 ) // disable SPDIF-IN loopback to SPDIF (bypass) if( *(int8 *)data == 0 ) // disable SPDIF-IN loopback to SPDIF (bypass)
set_direct( port->card, 0x04, 0x00, 0x80 ); set_direct( port->card, 0x04, 0x00, 0x80 );
@@ -1123,7 +1120,7 @@ pcm_control(
if( reg_value && 0x80 ) *(int8 *)data = 1; if( reg_value && 0x80 ) *(int8 *)data = 1;
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_SPDIF_OUT: case SOUND_SET_SPDIF_OUT:
if( *(int8 *)data == 0 ) // disable SPDIF-OUT if( *(int8 *)data == 0 ) // disable SPDIF-OUT
set_direct( port->card, 0x16, 0x00, 0x80); set_direct( port->card, 0x16, 0x00, 0x80);
@@ -1132,16 +1129,16 @@ pcm_control(
err = B_OK; err = B_OK;
break; break;
case SOUND_GET_SPDIF_MONITOR: case SOUND_GET_SPDIF_MONITOR:
*(int8 *)data = 0; *(int8 *)data = 0;
reg_value = get_direct( port->card, 0x24 ); reg_value = get_direct( port->card, 0x24 );
if( reg_value && 0x01 ) *(int8 *)data = 1; if( reg_value && 0x01 ) *(int8 *)data = 1;
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_SPDIF_MONITOR: case SOUND_SET_SPDIF_MONITOR:
if( *(int8 *)data == 0 ) // disable SPDIF_IN PCM to DAC (CDPlay) if( *(int8 *)data == 0 ) // disable SPDIF_IN PCM to DAC (CDPlay)
set_direct( port->card, 0x24, 0x00, 0x01 ); set_direct( port->card, 0x24, 0x00, 0x01 );
@@ -1149,21 +1146,21 @@ pcm_control(
set_direct( port->card, 0x24, 0x01, 0x01 ); set_direct( port->card, 0x24, 0x01, 0x01 );
err = B_OK; err = B_OK;
break; break;
case SOUND_GET_SPDIF_OUT_LEVEL: case SOUND_GET_SPDIF_OUT_LEVEL:
*(int8 *)data = 0; *(int8 *)data = 0;
reg_value = get_direct( port->card, 0x1b ); reg_value = get_direct( port->card, 0x1b );
if( reg_value && 0x02 ) *(int8 *)data = 1; if( reg_value && 0x02 ) *(int8 *)data = 1;
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_SPDIF_OUT_LEVEL: case SOUND_SET_SPDIF_OUT_LEVEL:
if( *(int8 *)data == 0 ) // enable SPDIF-OUT optical if( *(int8 *)data == 0 ) // enable SPDIF-OUT optical
set_direct( port->card, 0x1b, 0x00, 0x02 ); set_direct( port->card, 0x1b, 0x00, 0x02 );
else // enable SPDIF-OUT coaxial else // enable SPDIF-OUT coaxial
set_direct( port->card, 0x1b, 0x02, 0x02 ); set_direct( port->card, 0x1b, 0x02, 0x02 );
break; break;
case SOUND_GET_SPDIF_IN_FORMAT: case SOUND_GET_SPDIF_IN_FORMAT:
*(int8 *)data = 0; *(int8 *)data = 0;
reg_value = get_direct( port->card, 0x08 ); // Adresse 0x08 reg_value = get_direct( port->card, 0x08 ); // Adresse 0x08
@@ -1171,7 +1168,7 @@ pcm_control(
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_SPDIF_IN_FORMAT: case SOUND_SET_SPDIF_IN_FORMAT:
if( *(int8 *)data == 0 ) // disable SPDIF inverse (SPDIF normal) if( *(int8 *)data == 0 ) // disable SPDIF inverse (SPDIF normal)
set_direct( port->card, 0x08, 0x00, 0x80 ); set_direct( port->card, 0x08, 0x00, 0x80 );
@@ -1180,14 +1177,14 @@ pcm_control(
err = B_OK; err = B_OK;
break; break;
case SOUND_GET_SPDIF_IN_OUT_COPYRIGHT: case SOUND_GET_SPDIF_IN_OUT_COPYRIGHT:
*(int8 *)data = 0; *(int8 *)data = 0;
reg_value = get_direct( port->card, 0x16 ); reg_value = get_direct( port->card, 0x16 );
if( reg_value && 0x40 ) *(int8 *)data = 1; if( reg_value && 0x40 ) *(int8 *)data = 1;
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_SPDIF_IN_OUT_COPYRIGHT: case SOUND_SET_SPDIF_IN_OUT_COPYRIGHT:
if( *(int8 *)data == 0 ) // disable SPDIF-IN/OUT copyright protection if( *(int8 *)data == 0 ) // disable SPDIF-IN/OUT copyright protection
set_direct( port->card, 0x16, 0x00, 0x40 ); set_direct( port->card, 0x16, 0x00, 0x40 );
@@ -1195,14 +1192,14 @@ pcm_control(
set_direct( port->card, 0x16, 0x40, 0x40 ); set_direct( port->card, 0x16, 0x40, 0x40 );
err = B_OK; err = B_OK;
break; break;
case SOUND_GET_SPDIF_IN_VALIDITY: case SOUND_GET_SPDIF_IN_VALIDITY:
*(int8 *)data = 0; *(int8 *)data = 0;
reg_value = get_direct( port->card, 0x27 ); reg_value = get_direct( port->card, 0x27 );
if( reg_value && 0x02 ) *(int8 *)data = 1; if( reg_value && 0x02 ) *(int8 *)data = 1;
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_SPDIF_IN_VALIDITY: case SOUND_SET_SPDIF_IN_VALIDITY:
if( *(int8 *)data == 0 ) // disable SPDIF-IN validity detection if( *(int8 *)data == 0 ) // disable SPDIF-IN validity detection
set_direct( port->card, 0x27, 0x00, 0x02 ); set_direct( port->card, 0x27, 0x00, 0x02 );
@@ -1211,18 +1208,18 @@ pcm_control(
err = B_OK; err = B_OK;
break; break;
// control ports for analog settings // control ports for analog settings
case SOUND_GET_4_CHANNEL_DUPLICATE: case SOUND_GET_4_CHANNEL_DUPLICATE:
*(int8 *)data = 0; *(int8 *)data = 0;
reg_value = get_direct( port->card, 0x1b ); reg_value = get_direct( port->card, 0x1b );
if( reg_value && 0x04 ) *(int8 *)data = 1; if( reg_value && 0x04 ) *(int8 *)data = 1;
// 0x1b, 0x04, 0x04, /* dual channel mode enable */ // 0x1b, 0x04, 0x04, /* dual channel mode enable */
// 0x1a, 0x00, 0x80, /* Double DAC structure disable */ // 0x1a, 0x00, 0x80, /* Double DAC structure disable */
err = B_OK; err = B_OK;
break; break;
case SOUND_SET_4_CHANNEL_DUPLICATE: case SOUND_SET_4_CHANNEL_DUPLICATE:
if( *(int8 *)data == 0 ) // disable 4 channel analog duplicate mode if( *(int8 *)data == 0 ) // disable 4 channel analog duplicate mode
set_direct( port->card, 0x1b, 0x00, 0x04 ); set_direct( port->card, 0x1b, 0x00, 0x04 );
@@ -1235,22 +1232,22 @@ pcm_control(
case SOUND_GET_DEVICE_ID: case SOUND_GET_DEVICE_ID:
// *(int32*)data.vendor_id = cards[0].info.vendor_id; // *(int32*)data.vendor_id = cards[0].info.vendor_id;
// *(int32*)data.device_id = cards[0].info.device_id; // *(int32*)data.device_id = cards[0].info.device_id;
// chipinfo[0] = cards[0].info.vendor_id; // chipinfo[0] = cards[0].info.vendor_id;
*(int32 *)data = cards[0].info.device_id; *(int32 *)data = cards[0].info.device_id;
// memcpy(data, &chipinfo, sizeof(chipinfo)); // memcpy(data, &chipinfo, sizeof(chipinfo));
err = B_OK; err = B_OK;
break; break;
case SOUND_GET_INTERNAL_CHIP_ID: case SOUND_GET_INTERNAL_CHIP_ID:
// XXX // XXX
break; break;
case SOUND_GET_DRIVER_VERSION: case SOUND_GET_DRIVER_VERSION:
memcpy(data, &DriverVersion, sizeof(DriverVersion)); memcpy(data, &DriverVersion, sizeof(DriverVersion));
break; break;
default: default:
OLDAPI(("cmedia_pci: unknown code %ld\n", iop)); OLDAPI(("cmedia_pci: unknown code %ld\n", iop));
err = B_BAD_VALUE; err = B_BAD_VALUE;
@@ -1391,7 +1388,7 @@ first_time: /* we need to check whether anything's available first */
} }
switch (port->config.format) { switch (port->config.format) {
case 0x24: /* floats */ case 0x24: /* floats */
copy_short_to_float((float *)data, (const short *)(port->rd_cur+port->was_read), copy_short_to_float((float *)data, (const short *)(port->rd_cur+port->was_read),
block, !B_HOST_IS_LENDIAN == !port->config.big_endian); block, !B_HOST_IS_LENDIAN == !port->config.big_endian);
bytes_xferred = block * 2; bytes_xferred = block * 2;
break; break;
@@ -1514,7 +1511,7 @@ pcm_write(
} }
switch (port->config.format) { switch (port->config.format) {
case 0x24: /* floats */ case 0x24: /* floats */
copy_float_to_short((short *)(port->wr_cur+port->was_written), (const float *)data, copy_float_to_short((short *)(port->wr_cur+port->was_written), (const float *)data,
block, !B_HOST_IS_LENDIAN == !port->config.big_endian); block, !B_HOST_IS_LENDIAN == !port->config.big_endian);
bytes_xferred = block * 2; bytes_xferred = block * 2;
break; break;