diff options
author | pfg <pfg@FreeBSD.org> | 2012-01-26 21:43:11 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2012-01-26 21:43:11 +0000 |
commit | e7de0310724405390676f8aecbe28e852265b02a (patch) | |
tree | d503ebb571c93fa3028c3ba3f740aeb1f9fa8757 /sys/dev/sound/pci | |
parent | 0c19567ee45eb92c70702ba4f9f1a39f2b0972c2 (diff) | |
download | FreeBSD-src-e7de0310724405390676f8aecbe28e852265b02a.zip FreeBSD-src-e7de0310724405390676f8aecbe28e852265b02a.tar.gz |
Minor cleanups to the csa snd driver.
Remove unneeded temporary variable (data) to better match the OSS code.
Remove some unused constants and type definitions.
Tested by: joel
Approved by: jhb (mentor)
MFC after: 3 weeks
Diffstat (limited to 'sys/dev/sound/pci')
-rw-r--r-- | sys/dev/sound/pci/csa.c | 5 | ||||
-rw-r--r-- | sys/dev/sound/pci/csareg.h | 20 |
2 files changed, 2 insertions, 23 deletions
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 04ea4ec..a767993 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -861,7 +861,7 @@ static int csa_downloadimage(csa_res *resp) { int i; - u_int32_t tmp, src, dst, count, data; + u_int32_t tmp, src, dst, count; for (i = 0; i < CLEAR__COUNT; i++) { dst = ClrStat[i].BA1__DestByteOffset; @@ -875,8 +875,7 @@ csa_downloadimage(csa_res *resp) dst = FillStat[i].Offset; count = FillStat[i].Size; for (tmp = 0; tmp < count; tmp += 4) { - data = FillStat[i].pFill[src]; - csa_writemem(resp, dst + tmp, data); + csa_writemem(resp, dst + tmp, FillStat[i].pFill[src]); src++; } } diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h index c6767fb..54b64e0 100644 --- a/sys/dev/sound/pci/csareg.h +++ b/sys/dev/sound/pci/csareg.h @@ -1949,24 +1949,4 @@ #define CS_AC97_POWER_CONTROL_MIXVON_ON 0x0004 #define CS_AC97_POWER_CONTROL_MIXVOFF_ON 0x0008 -/* The following struct holds the initialization array. */ - -/* - * this is 3*1024 for parameter, 3.5*1024 for sample and 2*3.5*1024 for code since - * each instruction is 40 bits and takes two dwords - */ -#define INKY_BA1_DWORD_SIZE (13 * 1024 + 512) -#define INKY_MEMORY_COUNT 3 - -struct BA1struct -{ - struct - { - u_long ulDestByteOffset, - ulSourceByteSize; - } MemoryStat[INKY_MEMORY_COUNT]; - - u_long BA1Array[INKY_BA1_DWORD_SIZE]; -}; - #endif /* _CSA_REG_H */ |