From d6fdcf43049dc63b88a16c13128e8fe142f7febc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 26 Feb 2008 12:55:33 +0000 Subject: [PATCH] * More cleanup, build fix. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24138 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h | 11 ++++++----- src/add-ons/kernel/drivers/audio/hda/hda_controller.c | 8 +++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h b/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h index 1f4ff165c7..2e4f229db7 100644 --- a/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h +++ b/src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h @@ -42,7 +42,8 @@ typedef enum { /* Verb Helper Macro */ -#define MAKE_VERB(cad,nid,vid,payl) (((cad)<<28)|((nid)<<20)|(vid)|(payl)) +#define MAKE_VERB(cad, nid, vid, payload) \ + (((cad) << 28) | ((nid) << 20) | (vid) | (payload)) /* Verb IDs */ #define VID_GET_PARAM 0xF0000 @@ -57,15 +58,15 @@ typedef enum { #define VID_SET_PROCCOEFF 0x40000 #define VID_GET_AMPGAINMUTE 0xB0000 #define VID_SET_AMPGAINMUTE 0x30000 -#define VID_GET_CONVFORMAT 0xA0000 -#define VID_SET_CONVFORMAT 0x20000 +#define VID_GET_CONVERTER_FORMAT 0xa0000 +#define VID_SET_CONVERTER_FORMAT 0x20000 +#define VID_GET_CONVERTER_STREAM_CHANNEL 0xf0600 +#define VID_SET_CONVERTER_STREAM_CHANNEL 0x70600 #define VID_GET_DIGCVTCTRL 0xF0D00 #define VID_SET_DIGCVTCTRL1 0x70D00 #define VID_SET_DIGCVTCTRL2 0x70E00 #define VID_GET_POWERSTATE 0xF0500 #define VID_SET_POWERSTATE 0x70500 -#define VID_GET_CVTSTRCHN 0xF0600 -#define VID_SET_CVTSTRCHN 0x70600 #define VID_GET_SDISELECT 0xF0400 #define VID_SET_SDISELECT 0x70400 #define VID_GET_PINWCTRL 0xF0700 diff --git a/src/add-ons/kernel/drivers/audio/hda/hda_controller.c b/src/add-ons/kernel/drivers/audio/hda/hda_controller.c index 06caa1675d..e95b7aca25 100644 --- a/src/add-ons/kernel/drivers/audio/hda/hda_controller.c +++ b/src/add-ons/kernel/drivers/audio/hda/hda_controller.c @@ -292,12 +292,10 @@ dprintf("HDA: sample size %ld, num channels %ld, buffer length %ld ************* OREG8(audioGroup->codec->controller, stream->off, CTL2) = stream->id << 4; verb[0] = MAKE_VERB(audioGroup->codec->addr, stream->io_widget, - VID_SET_CONVFORMAT, wfmt); + VID_SET_CONVERTER_FORMAT, format); verb[1] = MAKE_VERB(audioGroup->codec->addr, stream->io_widget, - VID_SET_CVTSTRCHN, stream->id << 4); - rc = hda_send_verbs(audioGroup->codec, verb, response, 2); - - return rc; + VID_SET_CONVERTER_STREAM_CHANNEL, stream->id << 4); + return hda_send_verbs(audioGroup->codec, verb, response, 2); }