From dfb72c7888dc9f25d5868e7698c67706c5705fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 21 Dec 2009 11:05:12 +0000 Subject: [PATCH] * warn_count is unused. * the last valid index should be written in HDAC_STREAM_LAST_VALID instead of the fragment count. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34730 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/hda/driver.h | 1 - src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/hda/driver.h b/src/add-ons/kernel/drivers/audio/hda/driver.h index e6c9fe9516..3e46853ab1 100644 --- a/src/add-ons/kernel/drivers/audio/hda/driver.h +++ b/src/add-ons/kernel/drivers/audio/hda/driver.h @@ -132,7 +132,6 @@ struct hda_stream { bool running; spinlock lock; /* Write lock */ uint32 type; - int32 warn_count; hda_controller* controller; diff --git a/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp b/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp index 65918e1c6f..86985c8797 100644 --- a/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp +++ b/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp @@ -481,7 +481,6 @@ hda_stream_new(hda_audio_group* audioGroup, int type) stream->buffer_descriptors_area = B_ERROR; stream->type = type; stream->controller = controller; - stream->warn_count = 0; stream->incorrect_position_count = 0; stream->use_dma_position = true; @@ -694,7 +693,7 @@ hda_stream_setup_buffers(hda_audio_group* audioGroup, hda_stream* stream, stream->Write32(HDAC_STREAM_BUFFERS_BASE_LOWER, stream->physical_buffer_descriptors); stream->Write32(HDAC_STREAM_BUFFERS_BASE_UPPER, 0); - stream->Write16(HDAC_STREAM_LAST_VALID, fragments); + stream->Write16(HDAC_STREAM_LAST_VALID, fragments - 1); /* total cyclic buffer size in _bytes_ */ stream->Write32(HDAC_STREAM_BUFFER_SIZE, stream->buffer_size * stream->num_buffers);