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

Fixed Haiku coding style violations mostly pointed by FuncHaikuCheck.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36991 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Siarzhuk Zharski
2010-06-01 18:50:04 +00:00
parent 8b5a01bb4d
commit a5bc5bb66d
6 changed files with 111 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/ali5451/ali_multi.c
+8 -12
View File
@@ -108,9 +108,8 @@ static status_t
get_description(void *cookie, multi_description *data) get_description(void *cookie, multi_description *data)
{ {
multi_description description; multi_description description;
if(user_memcpy(&description, data, sizeof(multi_description)) != B_OK) { if (user_memcpy(&description, data, sizeof(multi_description)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
description.interface_version = B_CURRENT_INTERFACE_VERSION; description.interface_version = B_CURRENT_INTERFACE_VERSION;
description.interface_minimum = B_CURRENT_INTERFACE_VERSION; description.interface_minimum = B_CURRENT_INTERFACE_VERSION;
@@ -137,12 +136,11 @@ get_description(void *cookie, multi_description *data)
strcpy(description.control_panel,""); strcpy(description.control_panel,"");
if(user_memcpy(data, &description, sizeof(multi_description)) != B_OK) { if (user_memcpy(data, &description, sizeof(multi_description)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
if(description.request_channel_count >= if (description.request_channel_count
sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) { >= sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) {
if (user_memcpy(data->channels, if (user_memcpy(data->channels,
&channel_descriptions, sizeof(channel_descriptions)) != B_OK) &channel_descriptions, sizeof(channel_descriptions)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
@@ -291,8 +289,8 @@ set_mix_mixer(ali_dev *card, multi_mix_value *mmv, int32 id)
val |= (uint16) (((mixer_info->features&ALI_MIX_FT_GAIN) val |= (uint16) (((mixer_info->features&ALI_MIX_FT_GAIN)
? mixer_info->min_gain + mmv->u.gain ? mixer_info->min_gain + mmv->u.gain
: mixer_info->max_gain - mmv->u.gain) : mixer_info->max_gain - mmv->u.gain)
/ ALI_MIXER_GRANULARITY) << / ALI_MIXER_GRANULARITY)
((gadget_id == ALI_MIX_LEFT_ID) ? 8 : 0); << ((gadget_id == ALI_MIX_LEFT_ID) ? 8 : 0);
ac97_reg_cached_write(card->codec, mixer_info->reg, val); ac97_reg_cached_write(card->codec, mixer_info->reg, val);
break; break;
@@ -503,9 +501,8 @@ buffer_exchange(ali_dev *card, multi_buffer_info *info)
ali_stream *play_s, *rec_s; ali_stream *play_s, *rec_s;
multi_buffer_info buffer_info; multi_buffer_info buffer_info;
if(user_memcpy(&buffer_info, info, sizeof(multi_buffer_info)) != B_OK) { if (user_memcpy(&buffer_info, info, sizeof(multi_buffer_info)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
play_s = card->playback_stream; play_s = card->playback_stream;
rec_s = card->record_stream; rec_s = card->record_stream;
@@ -538,9 +535,8 @@ buffer_exchange(ali_dev *card, multi_buffer_info *info)
UNLOCK(card->lock_sts); UNLOCK(card->lock_sts);
if(user_memcpy(info, &buffer_info, sizeof(multi_buffer_info)) != B_OK) { if (user_memcpy(info, &buffer_info, sizeof(multi_buffer_info)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
return B_OK; return B_OK;
} }
src/add-ons/kernel/drivers/audio/null/null_multi.c
+36 -22
View File
@@ -7,6 +7,7 @@
*/ */
#include "driver.h" #include "driver.h"
// Convenience function to determine the byte count // Convenience function to determine the byte count
// of a sample for a given format. // of a sample for a given format.
// Note: Currently null_audio only supports 16 bit, // Note: Currently null_audio only supports 16 bit,
@@ -81,9 +82,8 @@ get_description(void* cookie, multi_description* data)
strcpy(description.control_panel,""); strcpy(description.control_panel,"");
if(user_memcpy(data, &description, sizeof(multi_description)) != B_OK) { if (user_memcpy(data, &description, sizeof(multi_description)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
if (description.request_channel_count if (description.request_channel_count
>= sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) { >= sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) {
@@ -146,7 +146,8 @@ get_global_format(device_t* device, multi_format_info* data)
static int32 static int32
create_group_control(multi_mix_control* multi, int32 idx, int32 parent, int32 string, const char* name) create_group_control(multi_mix_control* multi, int32 idx, int32 parent,
int32 string, const char* name)
{ {
multi->id = MULTI_AUDIO_BASE_ID + idx; multi->id = MULTI_AUDIO_BASE_ID + idx;
multi->parent = parent; multi->parent = parent;
@@ -193,15 +194,18 @@ list_mix_channels(void* cookie, multi_mix_channel_info* channel_info)
static status_t static status_t
get_buffers(device_t* device, multi_buffer_list* data) get_buffers(device_t* device, multi_buffer_list* data)
{ {
uint32 playback_sample_size = format_to_sample_size(device->playback_stream.format); uint32 playback_sample_size
uint32 record_sample_size = format_to_sample_size(device->record_stream.format); = format_to_sample_size(device->playback_stream.format);
uint32 record_sample_size
= format_to_sample_size(device->record_stream.format);
uint32 cidx, bidx; uint32 cidx, bidx;
status_t result; status_t result;
dprintf("null_audio: %s\n" , __func__ ); dprintf("null_audio: %s\n" , __func__ );
/* Workaround for Haiku multi_audio API, since it prefers to let the driver pick // Workaround for Haiku multi_audio API, since it prefers
values, while the BeOS multi_audio actually gives the user's defaults. */ // to let the driver pick values, while the BeOS multi_audio
// actually gives the user's defaults.
if (data->request_playback_buffers > STRMAXBUF if (data->request_playback_buffers > STRMAXBUF
|| data->request_playback_buffers < STRMINBUF) { || data->request_playback_buffers < STRMINBUF) {
data->request_playback_buffers = STRMINBUF; data->request_playback_buffers = STRMINBUF;
@@ -218,7 +222,8 @@ get_buffers(device_t* device, multi_buffer_list* data)
if (data->request_record_buffer_size == 0) if (data->request_record_buffer_size == 0)
data->request_record_buffer_size = FRAMES_PER_BUFFER; data->request_record_buffer_size = FRAMES_PER_BUFFER;
/* ... from here on, we can assume again that a reasonable request is being made */ // ... from here on, we can assume again that
// a reasonable request is being made
data->flags = 0; data->flags = 0;
@@ -227,16 +232,22 @@ get_buffers(device_t* device, multi_buffer_list* data)
device->playback_stream.num_buffers = data->request_playback_buffers; device->playback_stream.num_buffers = data->request_playback_buffers;
device->playback_stream.num_channels = data->request_playback_channels; device->playback_stream.num_channels = data->request_playback_channels;
device->playback_stream.buffer_length = data->request_playback_buffer_size; device->playback_stream.buffer_length = data->request_playback_buffer_size;
if ((result = null_hw_create_virtual_buffers(&device->playback_stream, "null_audio_playback_sem")) != B_OK) { result = null_hw_create_virtual_buffers(&device->playback_stream,
dprintf("null_audio %s: Error setting up playback buffers (%s)\n", __func__, strerror(result)); "null_audio_playback_sem");
if (result != B_OK) {
dprintf("null_audio %s: Error setting up playback buffers (%s)\n",
__func__, strerror(result));
return result; return result;
} }
device->record_stream.num_buffers = data->request_record_buffers; device->record_stream.num_buffers = data->request_record_buffers;
device->record_stream.num_channels = data->request_record_channels; device->record_stream.num_channels = data->request_record_channels;
device->record_stream.buffer_length = data->request_record_buffer_size; device->record_stream.buffer_length = data->request_record_buffer_size;
if ((result = null_hw_create_virtual_buffers(&device->record_stream, "null_audio_record_sem")) != B_OK) { result = null_hw_create_virtual_buffers(&device->record_stream,
dprintf("null_audio %s: Error setting up recording buffers (%s)\n", __func__, strerror(result)); "null_audio_record_sem");
if (result != B_OK) {
dprintf("null_audio %s: Error setting up recording buffers (%s)\n",
__func__, strerror(result));
return result; return result;
} }
@@ -247,8 +258,10 @@ get_buffers(device_t* device, multi_buffer_list* data)
for (bidx = 0; bidx < data->return_playback_buffers; bidx++) { for (bidx = 0; bidx < data->return_playback_buffers; bidx++) {
for (cidx = 0; cidx < data->return_playback_channels; cidx++) { for (cidx = 0; cidx < data->return_playback_channels; cidx++) {
data->playback_buffers[bidx][cidx].base = device->playback_stream.buffers[bidx] + (playback_sample_size * cidx); data->playback_buffers[bidx][cidx].base
data->playback_buffers[bidx][cidx].stride = playback_sample_size * data->return_playback_channels; = device->playback_stream.buffers[bidx] + (playback_sample_size * cidx);
data->playback_buffers[bidx][cidx].stride
= playback_sample_size * data->return_playback_channels;
} }
} }
@@ -258,8 +271,10 @@ get_buffers(device_t* device, multi_buffer_list* data)
for (bidx = 0; bidx < data->return_record_buffers; bidx++) { for (bidx = 0; bidx < data->return_record_buffers; bidx++) {
for (cidx = 0; cidx < data->return_record_channels; cidx++) { for (cidx = 0; cidx < data->return_record_channels; cidx++) {
data->record_buffers[bidx][cidx].base = device->record_stream.buffers[bidx] + (record_sample_size * cidx); data->record_buffers[bidx][cidx].base
data->record_buffers[bidx][cidx].stride = record_sample_size * data->return_record_channels; = device->record_stream.buffers[bidx] + (record_sample_size * cidx);
data->record_buffers[bidx][cidx].stride
= record_sample_size * data->return_record_channels;
} }
} }
@@ -276,9 +291,8 @@ buffer_exchange(device_t* device, multi_buffer_info* info)
status_t result; status_t result;
multi_buffer_info buffer_info; multi_buffer_info buffer_info;
if(user_memcpy(&buffer_info, info, sizeof(multi_buffer_info)) != B_OK) { if (user_memcpy(&buffer_info, info, sizeof(multi_buffer_info)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
// On first call, we start our fake hardware. // On first call, we start our fake hardware.
// Usually one would jump into his interrupt handler now // Usually one would jump into his interrupt handler now
@@ -312,13 +326,13 @@ buffer_exchange(device_t* device, multi_buffer_info* info)
restore_interrupts(status); restore_interrupts(status);
debug_buffers_exchanged++; debug_buffers_exchanged++;
if (((debug_buffers_exchanged % 5000) == 0) ) { //&& debug_buffers_exchanged < 1111) { if (((debug_buffers_exchanged % 5000) == 0) ) {
dprintf("null_audio: %s: %d buffers processed\n", __func__, debug_buffers_exchanged); dprintf("null_audio: %s: %d buffers processed\n",
__func__, debug_buffers_exchanged);
} }
if(user_memcpy(info, &buffer_info, sizeof(multi_buffer_info)) != B_OK) { if (user_memcpy(info, &buffer_info, sizeof(multi_buffer_info)) != B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
}
return B_OK; return B_OK;
} }