Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fixed Haiku version of B_MULTI_GET_DESCRIPTION

Browse Source 
* use user_memcpy for Haiku in buffer exchange, with interrupts enabled


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28860 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2009-01-08 23:39:02 +00:00
parent 0e5a3fc6c6
commit b8ea3ce774
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/add-ons/kernel/drivers/audio/hda/hda_multi_audio.cpp
View File

@ -793,6 +793,9 @@ buffer_exchange(hda_audio_group* audioGroup, multi_buffer_info* data)
static int debug_buffers_exchanged = 0; static int debug_buffers_exchanged = 0;
cpu_status status; cpu_status status;
status_t err; status_t err;
bigtime_t played_real_time, recorded_real_time;
uint64 played_frames_count, recorded_frames_count;
int32 playback_buffer_cycle, record_buffer_cycle;
// TODO: support recording! // TODO: support recording!
if (audioGroup->playback_stream == NULL) if (audioGroup->playback_stream == NULL)
@ -819,22 +822,36 @@ buffer_exchange(hda_audio_group* audioGroup, multi_buffer_info* data)
status = disable_interrupts(); status = disable_interrupts();
acquire_spinlock(&audioGroup->playback_stream->lock); acquire_spinlock(&audioGroup->playback_stream->lock);
data->playback_buffer_cycle = audioGroup->playback_stream->buffer_cycle; playback_buffer_cycle = audioGroup->playback_stream->buffer_cycle;
data->played_real_time = audioGroup->playback_stream->real_time; played_real_time = audioGroup->playback_stream->real_time;
data->played_frames_count = audioGroup->playback_stream->frames_count; played_frames_count = audioGroup->playback_stream->frames_count;
release_spinlock(&audioGroup->playback_stream->lock); release_spinlock(&audioGroup->playback_stream->lock);
if (audioGroup->record_stream) { if (audioGroup->record_stream) {
acquire_spinlock(&audioGroup->record_stream->lock); acquire_spinlock(&audioGroup->record_stream->lock);
data->record_buffer_cycle = audioGroup->record_stream->buffer_cycle; record_buffer_cycle = audioGroup->record_stream->buffer_cycle;
data->recorded_real_time = audioGroup->record_stream->real_time; recorded_real_time = audioGroup->record_stream->real_time;
data->recorded_frames_count = audioGroup->record_stream->frames_count; recorded_frames_count = audioGroup->record_stream->frames_count;
release_spinlock(&audioGroup->record_stream->lock); release_spinlock(&audioGroup->record_stream->lock);
} }
restore_interrupts(status); restore_interrupts(status);
#ifdef __HAIKU__
#define copy_to_user(x, y) if (user_memcpy(&x, &y, sizeof(x)) < B_OK) \
return B_BAD_ADDRESS
#else
#define copy_to_user(x, y) x = y
#endif
copy_to_user(data->playback_buffer_cycle, playback_buffer_cycle);
copy_to_user(data->played_real_time, played_real_time);
copy_to_user(data->played_frames_count, played_frames_count);
copy_to_user(data->record_buffer_cycle, record_buffer_cycle);
copy_to_user(data->recorded_real_time, recorded_real_time);
copy_to_user(data->recorded_frames_count, recorded_frames_count);
debug_buffers_exchanged++; debug_buffers_exchanged++;
if (((debug_buffers_exchanged % 100) == 1) && (debug_buffers_exchanged < 1111)) { if (((debug_buffers_exchanged % 100) == 1) && (debug_buffers_exchanged < 1111)) {
dprintf("%s: %d buffers processed\n", __func__, debug_buffers_exchanged); dprintf("%s: %d buffers processed\n", __func__, debug_buffers_exchanged);
@ -878,7 +895,7 @@ multi_audio_control(void* cookie, uint32 op, void* arg, size_t len)
switch (op) { switch (op) {
case B_MULTI_GET_DESCRIPTION: case B_MULTI_GET_DESCRIPTION:
{ {
#ifdef __HAIKU #ifdef __HAIKU__
multi_description description; multi_description description;
multi_channel_info channels[16]; multi_channel_info channels[16];
multi_channel_info* originalChannels; multi_channel_info* originalChannels;
@ -897,10 +914,11 @@ multi_audio_control(void* cookie, uint32 op, void* arg, size_t len)
return status; return status;
description.channels = originalChannels; description.channels = originalChannels;
return user_memcpy(arg, &description, sizeof(multi_description)) if (user_memcpy(arg, &description, sizeof(multi_description))
&& user_memcpy(originalChannels, channels, != B_OK)
sizeof(multi_channel_info) return B_BAD_ADDRESS;
* description.request_channel_count; return user_memcpy(originalChannels, channels, sizeof(multi_channel_info)
* description.request_channel_count);
#else #else
return get_description(audioGroup, (multi_description*)arg); return get_description(audioGroup, (multi_description*)arg);
#endif #endif