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

* More cleanup, build fix.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24138 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-02-26 12:55:33 +00:00
parent af45eef18d
commit d6fdcf4304
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/hda/hda_codec_defs.h
+6 -5
View File
@@ -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
src/add-ons/kernel/drivers/audio/hda/hda_controller.c
+3 -5
View File
@@ -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);
}