Author: bonefish Date: 2010-06-21 23:00:28 +0200 (Mon, 21 Jun 2010) New Revision: 37211 Changeset: http://dev.haiku-os.org/changeset/37211/haiku Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/null/null_multi.c Log: Fixed build. Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/null/null_multi.c =================================================================== --- haiku/trunk/src/add-ons/kernel/drivers/audio/null/null_multi.c 2010-06-21 20:21:06 UTC (rev 37210) +++ haiku/trunk/src/add-ons/kernel/drivers/audio/null/null_multi.c 2010-06-21 21:00:28 UTC (rev 37211) @@ -48,9 +48,10 @@ static status_t get_description(void* cookie, multi_description* data) { + multi_description description; + dprintf("null_audio: %s\n" , __func__ ); - - multi_description description; + if (user_memcpy(&description, data, sizeof(multi_description)) != B_OK) { return B_BAD_ADDRESS; } @@ -84,7 +85,7 @@ if (user_memcpy(data, &description, sizeof(multi_description)) != B_OK) return B_BAD_ADDRESS; - + if (description.request_channel_count >= sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) { if (user_memcpy(data->channels, @@ -156,7 +157,7 @@ multi->string = string; if (name) strcpy(multi->name, name); - + return multi->id; } @@ -202,7 +203,7 @@ status_t result; dprintf("null_audio: %s\n" , __func__ ); - + // Workaround for Haiku multi_audio API, since it prefers // to let the driver pick values, while the BeOS multi_audio // actually gives the user's defaults.