Skip to content

L
linux
Commit 3f7468a7 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files
Options

[PATCH] janitor: sound/oss: use C99 inits. 

From: "Randy.Dunlap" <rddunlap@osdl.org>,
      "Maciej Soltysiak" <solt@dns.toxicfilms.tv>

C99 initializers for linux/sound.
parent 8e4c6c31
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 359 additions and 359 deletions
sound/oss/dmasound/tas3001c.c
View file @ 3f7468a7
...@@ -55,7 +55,7 @@ struct tas3001c_data_t { ...@@ -55,7 +55,7 @@ struct tas3001c_data_t {
static const union tas_biquad_t static const union tas_biquad_t
tas3001c_eq_unity={ tas3001c_eq_unity={
buf: { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 } .buf = { 0x100000, 0x000000, 0x000000, 0x000000, 0x000000 }
}; };
......
sound/oss/dmasound/tas3001c_tables.c
View file @ 3f7468a7
This diff is collapsed.
sound/oss/dmasound/tas3004_tables.c
View file @ 3f7468a7
This diff is collapsed.
sound/oss/dmasound/trans_16.c
View file @ 3f7468a7
...@@ -573,34 +573,34 @@ static ssize_t pmac_ct_u16_read(const u_char *userPtr, size_t userCount, ...@@ -573,34 +573,34 @@ static ssize_t pmac_ct_u16_read(const u_char *userPtr, size_t userCount,
} }
TRANS transAwacsNormal = { TRANS transAwacsNormal = {
ct_ulaw: pmac_ct_law, .ct_ulaw= pmac_ct_law,
ct_alaw: pmac_ct_law, .ct_alaw= pmac_ct_law,
ct_s8: pmac_ct_s8, .ct_s8= pmac_ct_s8,
ct_u8: pmac_ct_u8, .ct_u8= pmac_ct_u8,
ct_s16be: pmac_ct_s16, .ct_s16be= pmac_ct_s16,
ct_u16be: pmac_ct_u16, .ct_u16be= pmac_ct_u16,
ct_s16le: pmac_ct_s16, .ct_s16le= pmac_ct_s16,
ct_u16le: pmac_ct_u16, .ct_u16le= pmac_ct_u16,
}; };
TRANS transAwacsExpand = { TRANS transAwacsExpand = {
ct_ulaw: pmac_ctx_law, .ct_ulaw= pmac_ctx_law,
ct_alaw: pmac_ctx_law, .ct_alaw= pmac_ctx_law,
ct_s8: pmac_ctx_s8, .ct_s8= pmac_ctx_s8,
ct_u8: pmac_ctx_u8, .ct_u8= pmac_ctx_u8,
ct_s16be: pmac_ctx_s16, .ct_s16be= pmac_ctx_s16,
ct_u16be: pmac_ctx_u16, .ct_u16be= pmac_ctx_u16,
ct_s16le: pmac_ctx_s16, .ct_s16le= pmac_ctx_s16,
ct_u16le: pmac_ctx_u16, .ct_u16le= pmac_ctx_u16,
}; };
TRANS transAwacsNormalRead = { TRANS transAwacsNormalRead = {
ct_s8: pmac_ct_s8_read, .ct_s8= pmac_ct_s8_read,
ct_u8: pmac_ct_u8_read, .ct_u8= pmac_ct_u8_read,
ct_s16be: pmac_ct_s16_read, .ct_s16be= pmac_ct_s16_read,
ct_u16be: pmac_ct_u16_read, .ct_u16be= pmac_ct_u16_read,
ct_s16le: pmac_ct_s16_read, .ct_s16le= pmac_ct_s16_read,
ct_u16le: pmac_ct_u16_read, .ct_u16le= pmac_ct_u16_read,
}; };
/* translation tables */ /* translation tables */
......
sound/oss/sb_card.h
View file @ 3f7468a7
...@@ -25,119 +25,119 @@ struct sb_card_config { ...@@ -25,119 +25,119 @@ struct sb_card_config {
/* Card PnP ID Table */ /* Card PnP ID Table */
static struct pnp_card_device_id sb_pnp_card_table[] = { static struct pnp_card_device_id sb_pnp_card_table[] = {
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL0024", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0024", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL0025", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0025", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL0026", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0026", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL0027", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0027", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL0028", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0028", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL0029", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0029", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL002a", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL002a", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL002b", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL002b", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL002c", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL002c", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL00ed", .driver_data = 0, devs : { {.id="CTL0041"}, } }, {.id = "CTL00ed", .driver_data = 0, .devs = { {.id="CTL0041"}, } },
/* Sound Blaster 16 */ /* Sound Blaster 16 */
{.id = "CTL0086", .driver_data = 0, devs : { {.id="CTL0041"}, } }, {.id = "CTL0086", .driver_data = 0, .devs = { {.id="CTL0041"}, } },
/* Sound Blaster Vibra16S */ /* Sound Blaster Vibra16S */
{.id = "CTL0051", .driver_data = 0, devs : { {.id="CTL0001"}, } }, {.id = "CTL0051", .driver_data = 0, .devs = { {.id="CTL0001"}, } },
/* Sound Blaster Vibra16C */ /* Sound Blaster Vibra16C */
{.id = "CTL0070", .driver_data = 0, devs : { {.id="CTL0001"}, } }, {.id = "CTL0070", .driver_data = 0, .devs = { {.id="CTL0001"}, } },
/* Sound Blaster Vibra16CL */ /* Sound Blaster Vibra16CL */
{.id = "CTL0080", .driver_data = 0, devs : { {.id="CTL0041"}, } }, {.id = "CTL0080", .driver_data = 0, .devs = { {.id="CTL0041"}, } },
/* Sound Blaster Vibra16CL */ /* Sound Blaster Vibra16CL */
{.id = "CTL00F0", .driver_data = 0, devs : { {.id="CTL0043"}, } }, {.id = "CTL00F0", .driver_data = 0, .devs = { {.id="CTL0043"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0039", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0039", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0042", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0042", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0043", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0043", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0044", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0044", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0045", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0045", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0046", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0046", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0047", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0047", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0048", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0048", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL0054", .driver_data = 0, devs : { {.id="CTL0031"}, } }, {.id = "CTL0054", .driver_data = 0, .devs = { {.id="CTL0031"}, } },
/* Sound Blaster AWE 32 */ /* Sound Blaster AWE 32 */
{.id = "CTL009C", .driver_data = 0, devs : { {.id="CTL0041"}, } }, {.id = "CTL009C", .driver_data = 0, .devs = { {.id="CTL0041"}, } },
/* Createive SB32 PnP */ /* Createive SB32 PnP */
{.id = "CTL009F", .driver_data = 0, devs : { {.id="CTL0041"}, } }, {.id = "CTL009F", .driver_data = 0, .devs = { {.id="CTL0041"}, } },
/* Sound Blaster AWE 64 */ /* Sound Blaster AWE 64 */
{.id = "CTL009D", .driver_data = 0, devs : { {.id="CTL0042"}, } }, {.id = "CTL009D", .driver_data = 0, .devs = { {.id="CTL0042"}, } },
/* Sound Blaster AWE 64 Gold */ /* Sound Blaster AWE 64 Gold */
{.id = "CTL009E", .driver_data = 0, devs : { {.id="CTL0044"}, } }, {.id = "CTL009E", .driver_data = 0, .devs = { {.id="CTL0044"}, } },
/* Sound Blaster AWE 64 Gold */ /* Sound Blaster AWE 64 Gold */
{.id = "CTL00B2", .driver_data = 0, devs : { {.id="CTL0044"}, } }, {.id = "CTL00B2", .driver_data = 0, .devs = { {.id="CTL0044"}, } },
/* Sound Blaster AWE 64 */ /* Sound Blaster AWE 64 */
{.id = "CTL00C1", .driver_data = 0, devs : { {.id="CTL0042"}, } }, {.id = "CTL00C1", .driver_data = 0, .devs = { {.id="CTL0042"}, } },
/* Sound Blaster AWE 64 */ /* Sound Blaster AWE 64 */
{.id = "CTL00C3", .driver_data = 0, devs : { {.id="CTL0045"}, } }, {.id = "CTL00C3", .driver_data = 0, .devs = { {.id="CTL0045"}, } },
/* Sound Blaster AWE 64 */ /* Sound Blaster AWE 64 */
{.id = "CTL00C5", .driver_data = 0, devs : { {.id="CTL0045"}, } }, {.id = "CTL00C5", .driver_data = 0, .devs = { {.id="CTL0045"}, } },
/* Sound Blaster AWE 64 */ /* Sound Blaster AWE 64 */
{.id = "CTL00C7", .driver_data = 0, devs : { {.id="CTL0045"}, } }, {.id = "CTL00C7", .driver_data = 0, .devs = { {.id="CTL0045"}, } },
/* Sound Blaster AWE 64 */ /* Sound Blaster AWE 64 */
{.id = "CTL00E4", .driver_data = 0, devs : { {.id="CTL0045"}, } }, {.id = "CTL00E4", .driver_data = 0, .devs = { {.id="CTL0045"}, } },
/* Sound Blaster AWE 64 */ /* Sound Blaster AWE 64 */
{.id = "CTL00E9", .driver_data = 0, devs : { {.id="CTL0045"}, } }, {.id = "CTL00E9", .driver_data = 0, .devs = { {.id="CTL0045"}, } },
/* ESS 1868 */ /* ESS 1868 */
{.id = "ESS0968", .driver_data = 0, devs : { {.id="ESS0968"}, } }, {.id = "ESS0968", .driver_data = 0, .devs = { {.id="ESS0968"}, } },
/* ESS 1868 */ /* ESS 1868 */
{.id = "ESS1868", .driver_data = 0, devs : { {.id="ESS1868"}, } }, {.id = "ESS1868", .driver_data = 0, .devs = { {.id="ESS1868"}, } },
/* ESS 1868 */ /* ESS 1868 */
{.id = "ESS1868", .driver_data = 0, devs : { {.id="ESS8611"}, } }, {.id = "ESS1868", .driver_data = 0, .devs = { {.id="ESS8611"}, } },
/* ESS 1869 PnP AudioDrive */ /* ESS 1869 PnP AudioDrive */
{.id = "ESS0003", .driver_data = 0, devs : { {.id="ESS1869"}, } }, {.id = "ESS0003", .driver_data = 0, .devs = { {.id="ESS1869"}, } },
/* ESS 1869 */ /* ESS 1869 */
{.id = "ESS1869", .driver_data = 0, devs : { {.id="ESS1869"}, } }, {.id = "ESS1869", .driver_data = 0, .devs = { {.id="ESS1869"}, } },
/* ESS 1878 */ /* ESS 1878 */
{.id = "ESS1878", .driver_data = 0, devs : { {.id="ESS1878"}, } }, {.id = "ESS1878", .driver_data = 0, .devs = { {.id="ESS1878"}, } },
/* ESS 1879 */ /* ESS 1879 */
{.id = "ESS1879", .driver_data = 0, devs : { {.id="ESS1879"}, } }, {.id = "ESS1879", .driver_data = 0, .devs = { {.id="ESS1879"}, } },
/* CMI 8330 SoundPRO */ /* CMI 8330 SoundPRO */
{.id = "CMI0001", .driver_data = 0, devs : { {.id="@X@0001"}, {.id = "CMI0001", .driver_data = 0, .devs = { {.id="@X@0001"},
{.id="@H@0001"}, {.id="@H@0001"},
{.id="@@@0001"}, } }, {.id="@@@0001"}, } },
/* Diamond DT0197H */ /* Diamond DT0197H */
{.id = "RWR1688", .driver_data = 0, devs : { {.id="@@@0001"}, {.id = "RWR1688", .driver_data = 0, .devs = { {.id="@@@0001"},
{.id="@X@0001"}, {.id="@X@0001"},
{.id="@H@0001"}, } }, {.id="@H@0001"}, } },
/* ALS007 */ /* ALS007 */
{.id = "ALS0007", .driver_data = 0, devs : { {.id="@@@0001"}, {.id = "ALS0007", .driver_data = 0, .devs = { {.id="@@@0001"},
{.id="@X@0001"}, {.id="@X@0001"},
{.id="@H@0001"}, } }, {.id="@H@0001"}, } },
/* ALS100 */ /* ALS100 */
{.id = "ALS0001", .driver_data = 0, devs : { {.id="@@@0001"}, {.id = "ALS0001", .driver_data = 0, .devs = { {.id="@@@0001"},
{.id="@X@0001"}, {.id="@X@0001"},
{.id="@H@0001"}, } }, {.id="@H@0001"}, } },
/* ALS110 */ /* ALS110 */
{.id = "ALS0110", .driver_data = 0, devs : { {.id="@@@1001"}, {.id = "ALS0110", .driver_data = 0, .devs = { {.id="@@@1001"},
{.id="@X@1001"}, {.id="@X@1001"},
{.id="@H@0001"}, } }, {.id="@H@0001"}, } },
/* ALS120 */ /* ALS120 */
{.id = "ALS0120", .driver_data = 0, devs : { {.id="@@@2001"}, {.id = "ALS0120", .driver_data = 0, .devs = { {.id="@@@2001"},
{.id="@X@2001"}, {.id="@X@2001"},
{.id="@H@0001"}, } }, {.id="@H@0001"}, } },
/* ALS200 */ /* ALS200 */
{.id = "ALS0200", .driver_data = 0, devs : { {.id="@@@0020"}, {.id = "ALS0200", .driver_data = 0, .devs = { {.id="@@@0020"},
{.id="@X@0030"}, {.id="@X@0030"},
{.id="@H@0001"}, } }, {.id="@H@0001"}, } },
/* ALS200 */ /* ALS200 */
{.id = "RTL3000", .driver_data = 0, devs : { {.id="@@@2001"}, {.id = "RTL3000", .driver_data = 0, .devs = { {.id="@@@2001"},
{.id="@X@2001"}, {.id="@X@2001"},
{.id="@H@0001"}, } }, {.id="@H@0001"}, } },
/* -end- */ /* -end- */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7