From: Thiago Farina <tfransosi@gmail.com>
To: wanlong.gao@gmail.com
Cc: linux-kernel@vger.kernel.org, Riccardo Facchetti <fizban@tin.it>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
alsa-devel@alsa-project.org
Subject: Re: [PATCH 1/1] sound/oss/aedsp16.c: Remove #define TRUE/FALSE, use bool instead.
Date: Mon, 18 Apr 2011 01:07:48 -0300 [thread overview]
Message-ID: <BANLkTin-KyduTH4vdFEA-eZYQVGAHRDQpg@mail.gmail.com> (raw)
In-Reply-To: <BANLkTin_UNQPPDPWq_4qySd-4DAOrR53pA@mail.gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 29556 bytes --]
On Sun, Apr 17, 2011 at 10:03 PM, Wanlong Gao <wanlong.gao@gmail.com> wrote:
> On 4/18/11, Thiago Farina <tfransosi@gmail.com> wrote:
>> Signed-off-by: Thiago Farina <tfransosi@gmail.com>
>> ---
>> Â sound/oss/aedsp16.c | Â 324
>> +++++++++++++++++++++++++--------------------------
>> Â 1 files changed, 158 insertions(+), 166 deletions(-)
>>
>> diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c
>> index 35b5912..5ae37b6 100644
>> --- a/sound/oss/aedsp16.c
>> +++ b/sound/oss/aedsp16.c
>> @@ -245,12 +245,11 @@
>>
>> Â */
>>
>> +#define VERSION "1.3" Â Â Â Â Â Â Â Â /* Version of Audio Excel DSP 16 driver. Â */
>>
>> -#define VERSION "1.3" Â Â Â Â Â Â Â Â /* Version of Audio Excel DSP 16 driver */
>> -
>> -#undef    AEDSP16_DEBUG      /* Define this to 1 to enable debug code   */
>> -#undef    AEDSP16_DEBUG_MORE    /* Define this to 1 to enable more debug   */
>> -#undef    AEDSP16_INFO       /* Define this to 1 to enable info code    */
>> +#undef    AEDSP16_DEBUG      /* Define this to 1 to enable debug code. */
>> +#undef    AEDSP16_DEBUG_MORE    /* Define this to 1 to enable more debug. */
>> +#undef    AEDSP16_INFO       /* Define this to 1 to enable info code.  */
>>
>> Â #if defined(AEDSP16_DEBUG)
>> Â # define DBG(x) Â printk x
>> @@ -265,12 +264,6 @@
>> Â #endif
>>
>> Â /*
>> - * Misc definitions
>> - */
>> -#define TRUE 1
>> -#define FALSE Â Â Â Â 0
>> -
>> -/*
>> Â * Region Size for request/check/release region.
>> Â */
>> Â #define IOBASE_REGION_SIZE Â 0x10
>> @@ -497,7 +490,7 @@ static struct aedsp16_info ae_config = {
>>  static char   DSPCopyright[CARDNAMELEN + 1] __initdata = {0, };
>>  static char   DSPVersion[CARDVERLEN + 1] __initdata = {0, };
>>
>> -static int __init aedsp16_wait_data(int port)
>> +static bool __init aedsp16_wait_data(int port)
>> Â {
>>    int       loop = STATUSRETRY;
>>    unsigned char  ret = 0;
>> @@ -505,19 +498,19 @@ static int __init aedsp16_wait_data(int port)
>> Â Â Â DBG1(("aedsp16_wait_data (0x%x): ", port));
>>
>> Â Â Â do {
>> - Â Â Â Â Â Â Â ret = inb(port + DSP_DATAVAIL);
>> - Â Â /*
>> - Â Â Â * Wait for data available (bit 7 of ret == 1)
>> - Â Â Â */
>> - Â Â Â } while (!(ret & 0x80) && loop--);
>> + Â Â Â Â Â Â ret = inb(port + DSP_DATAVAIL);
>> + Â Â Â Â Â Â /*
>> + Â Â Â Â Â Â Â * Wait for data available (bit 7 of ret == 1)
>> + Â Â Â Â Â Â Â */
>> + Â Â } while (!(ret & 0x80) && loop--);
>>
>> Â Â Â if (ret & 0x80) {
>> Â Â Â Â Â Â Â DBG1(("success.\n"));
>> - Â Â Â Â Â Â return TRUE;
>> + Â Â Â Â Â Â return true;
>> Â Â Â }
>>
>> Â Â Â DBG1(("failure.\n"));
>> - Â Â return FALSE;
>> + Â Â return false;
>> Â }
>>
>> Â static int __init aedsp16_read(int port)
>> @@ -526,7 +519,7 @@ static int __init aedsp16_read(int port)
>>
>> Â Â Â DBG((" Â Â Read DSP Byte (0x%x): ", port));
>>
>> - Â Â if (aedsp16_wait_data(port) == FALSE) {
>> + Â Â if (aedsp16_wait_data(port) == false) {
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> Â Â Â Â Â Â Â return -1;
>> Â Â Â }
>> @@ -538,17 +531,16 @@ static int __init aedsp16_read(int port)
>> Â Â Â return inbyte;
>> Â }
>>
>> -static int __init aedsp16_test_dsp(int port)
>> +static bool __init aedsp16_test_dsp(int port)
>> Â {
>> - Â Â return ((aedsp16_read(port) == 0xaa) ? TRUE : FALSE);
>> + Â Â return ((aedsp16_read(port) == 0xaa) ? true : false);
>> Â }
>>
>> -static int __init aedsp16_dsp_reset(int port)
>> +static bool __init aedsp16_dsp_reset(int port)
>> Â {
>> Â Â Â /*
>> - Â Â Â * Reset DSP
>> + Â Â Â * Reset DSP.
>> Â Â Â Â */
>> -
>> Â Â Â DBG(("Reset DSP:\n"));
>>
>> Â Â Â outb(1, (port + DSP_RESET));
>> @@ -556,12 +548,12 @@ static int __init aedsp16_dsp_reset(int port)
>> Â Â Â outb(0, (port + DSP_RESET));
>> Â Â Â udelay(10);
>> Â Â Â udelay(10);
>> - Â Â if (aedsp16_test_dsp(port) == TRUE) {
>> + Â Â if (aedsp16_test_dsp(port) == true) {
>> Â Â Â Â Â Â Â DBG(("success.\n"));
>> - Â Â Â Â Â Â return TRUE;
>> + Â Â Â Â Â Â return true;
>> Â Â Â } else
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â return FALSE;
>> + Â Â return false;
>> Â }
>>
>> Â static int __init aedsp16_write(int port, int cmd)
>> @@ -678,66 +670,66 @@ static int __init aedsp16_hard_write(int port) {
>> Â Â Â if (aedsp16_write(port, COMMAND_6C)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_6C);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, COMMAND_5C)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, hard_cfg[0])) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] DATA 0x%x: failed!\n", hard_cfg[0]);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, hard_cfg[1])) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] DATA 0x%x: failed!\n", hard_cfg[1]);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, COMMAND_C5)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_C5);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â DBG(("success.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> -static int __init aedsp16_hard_read(int port) {
>> +static bool __init aedsp16_hard_read(int port) {
>>
>> Â Â Â DBG(("aedsp16_hard_read:\n"));
>>
>> Â Â Â if (aedsp16_write(port, READ_HARD_CFG)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", READ_HARD_CFG);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â if ((hard_cfg[0] = aedsp16_read(port)) == -1) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",
>> Â Â Â Â Â Â Â Â Â Â Â READ_HARD_CFG);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if ((hard_cfg[1] = aedsp16_read(port)) == -1) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",
>> Â Â Â Â Â Â Â Â Â Â Â READ_HARD_CFG);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_read(port) == -1) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",
>> Â Â Â Â Â Â Â Â Â Â Â READ_HARD_CFG);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â DBG(("success.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> Â static int __init aedsp16_ext_cfg_write(int port) {
>> @@ -746,7 +738,7 @@ static int __init aedsp16_ext_cfg_write(int port) {
>>
>> Â Â Â if (aedsp16_write(port, COMMAND_66)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_66);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â extcfg = 7;
>> @@ -762,51 +754,51 @@ static int __init aedsp16_ext_cfg_write(int port) {
>>
>> Â Â Â if (aedsp16_write(port, extcfg)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] Write extcfg: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, 0)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] Write extcfg: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (decoded_hcfg.cdrom == 3) {
>> Â Â Â Â Â Â Â if (aedsp16_write(port, COMMAND_52)) {
>> Â Â Â Â Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_52);
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> Â Â Â Â Â Â Â if ((val = aedsp16_read(port)) == -1) {
>> Â Â Â Â Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n"
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â , COMMAND_52);
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> Â Â Â Â Â Â Â val &= 0x7F;
>> Â Â Â Â Â Â Â if (aedsp16_write(port, COMMAND_60)) {
>> Â Â Â Â Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_60);
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> Â Â Â Â Â Â Â if (aedsp16_write(port, val)) {
>> Â Â Â Â Â Â Â Â Â Â Â printk("[AEDSP16] Write val: failed!\n");
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> Â #endif /* CONFIG_SC6600 */
>>
>> -static int __init aedsp16_cfg_write(int port) {
>> +static bool __init aedsp16_cfg_write(int port) {
>> Â Â Â if (aedsp16_write(port, WRITE_MDIRQ_CFG)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, soft_cfg)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] Initialization of (M)IRQ and DMA: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> -static int __init aedsp16_init_mss(int port)
>> +static bool __init aedsp16_init_mss(int port)
>> Â {
>> Â Â Â DBG(("aedsp16_init_mss:\n"));
>>
>> @@ -816,154 +808,153 @@ static int __init aedsp16_init_mss(int port)
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_init_mss [0x%x]: failed!\n",
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â DSP_INIT_MSS);
>> Â Â Â Â Â Â Â DBG(("failure.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> -
>> Â Â Â mdelay(10);
>>
>> - Â Â if (aedsp16_cfg_write(port) == FALSE)
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â if (aedsp16_cfg_write(port) == false)
>> + Â Â Â Â Â Â return false;
>>
>> Â Â Â outb(soft_cfg_mss, ae_config.mss_base);
>>
>> Â Â Â DBG(("success.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> -static int __init aedsp16_setup_board(int port) {
>> -   int   loop = RETRY;
>> +static bool __init aedsp16_setup_board(int port) {
>> + Â Â int loop = RETRY;
>>
>> Â #if defined(CONFIG_SC6600)
>> -   int   val = 0;
>> + Â Â int val = 0;
>>
>> - Â Â if (aedsp16_hard_read(port) == FALSE) {
>> + Â Â if (aedsp16_hard_read(port) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_hard_read: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â if (aedsp16_write(port, COMMAND_52)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_52);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â if ((val = aedsp16_read(port)) == -1) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â COMMAND_52);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â #endif
>>
>> Â Â Â do {
>> Â Â Â Â Â Â Â if (aedsp16_write(port, COMMAND_88)) {
>> Â Â Â Â Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_88);
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> Â Â Â Â Â Â Â mdelay(10);
>> - Â Â } while ((aedsp16_wait_data(port) == FALSE) && loop--);
>> + Â Â } while ((aedsp16_wait_data(port) == false) && loop--);
>>
>> Â Â Â if (aedsp16_read(port) == -1) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â COMMAND_88);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â #if !defined(CONFIG_SC6600)
>> Â Â Â if (aedsp16_write(port, COMMAND_5C)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â #endif
>>
>> - Â Â if (aedsp16_cfg_write(port) == FALSE)
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â if (aedsp16_cfg_write(port) == false)
>> + Â Â Â Â Â Â return false;
>>
>> Â #if defined(CONFIG_SC6600)
>> Â Â Â if (aedsp16_write(port, COMMAND_60)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_60);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, val)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] DATA 0x%x: failed!\n", val);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, COMMAND_6E)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_6E);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, ver[0])) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] DATA 0x%x: failed!\n", ver[0]);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â if (aedsp16_write(port, ver[1])) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] DATA 0x%x: failed!\n", ver[1]);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> - Â Â if (aedsp16_hard_write(port) == FALSE) {
>> + Â Â if (aedsp16_hard_write(port) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_hard_write: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â if (aedsp16_write(port, COMMAND_5C)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â #if defined(THIS_IS_A_THING_I_HAVE_NOT_TESTED_YET)
>> - Â Â if (aedsp16_cfg_write(port) == FALSE)
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â if (aedsp16_cfg_write(port) == false)
>> + Â Â Â Â Â Â return false;
>> Â #endif
>>
>> Â #endif
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> -static int __init aedsp16_stdcfg(int port) {
>> +static bool __init aedsp16_stdcfg(int port) {
>> Â Â Â if (aedsp16_write(port, WRITE_MDIRQ_CFG)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG);
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â Â Â /*
>> Â Â Â Â * 0x0A == (IRQ 7, DMA 1, MIRQ 0)
>> Â Â Â Â */
>> Â Â Â if (aedsp16_write(port, 0x0A)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_stdcfg: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> -static int __init aedsp16_dsp_version(int port)
>> +static bool __init aedsp16_dsp_version(int port)
>> Â {
>> -   int       len = 0;
>> -   int       ret;
>> + Â Â int len = 0;
>> + Â Â int ret;
>>
>> Â Â Â DBG(("Get DSP Version:\n"));
>>
>> Â Â Â if (aedsp16_write(ae_config.base_io, GET_DSP_VERSION)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", GET_DSP_VERSION);
>> Â Â Â Â Â Â Â DBG(("failed.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â do {
>> Â Â Â Â Â Â Â if ((ret = aedsp16_read(port)) == -1) {
>> Â Â Â Â Â Â Â Â Â Â Â DBG(("failed.\n"));
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> - Â Â /*
>> - Â Â Â * We already know how many int are stored (2), so we know when the
>> - Â Â Â * string is finished.
>> - Â Â Â */
>> + Â Â Â Â Â Â /*
>> + Â Â Â Â Â Â Â * We already know how many int are stored (2), so we know when
>> + Â Â Â Â Â Â Â * the string is finished.
>> + Â Â Â Â Â Â Â */
>> Â Â Â Â Â Â Â ver[len++] = ret;
>> Â Â Â Â } while (len < CARDVERDIGITS);
>> Â Â Â sprintf(DSPVersion, "%d.%d", ver[0], ver[1]);
>>
>> Â Â Â DBG(("success.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> Â static int __init aedsp16_dsp_copyright(int port)
>> @@ -976,20 +967,21 @@ static int __init aedsp16_dsp_copyright(int port)
>> Â Â Â if (aedsp16_write(ae_config.base_io, GET_DSP_COPYRIGHT)) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] CMD 0x%x: failed!\n", GET_DSP_COPYRIGHT);
>> Â Â Â Â Â Â Â DBG(("failed.\n"));
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â do {
>> Â Â Â Â Â Â Â if ((ret = aedsp16_read(port)) == -1) {
>> - Â Â /*
>> - Â Â Â * If no more data available, return to the caller, no error if len>0.
>> - Â Â Â * We have no other way to know when the string is finished.
>> - Â Â Â */
>> + Â Â Â Â Â Â Â Â Â Â /*
>> + Â Â Â Â Â Â Â Â Â Â Â * If no more data available, return to the caller, no
>> + Â Â Â Â Â Â Â Â Â Â Â * error if len > 0. We have no other way to know when
>> + Â Â Â Â Â Â Â Â Â Â Â * the string is finished.
>> + Â Â Â Â Â Â Â Â Â Â Â */
>> Â Â Â Â Â Â Â Â Â Â Â if (len)
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
>> Â Â Â Â Â Â Â Â Â Â Â else {
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â DBG(("failed.\n"));
>> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â Â Â Â Â }
>> Â Â Â Â Â Â Â }
>>
>> @@ -999,7 +991,7 @@ static int __init aedsp16_dsp_copyright(int port)
>>
>> Â Â Â DBG(("success.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> Â static void __init aedsp16_init_tables(void)
>> @@ -1026,17 +1018,17 @@ static void __init aedsp16_init_tables(void)
>> Â Â Â Â Â Â Â }
>> Â }
>>
>> -static int __init aedsp16_init_board(void)
>> +static bool __init aedsp16_init_board(void)
>> Â {
>> Â Â Â aedsp16_init_tables();
>>
>> - Â Â if (aedsp16_dsp_reset(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_dsp_reset(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_dsp_reset: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> - Â Â if (aedsp16_dsp_copyright(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_dsp_copyright(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_dsp_copyright: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â /*
>> @@ -1046,48 +1038,48 @@ static int __init aedsp16_init_board(void)
>> Â Â Â if (strcmp("SC-6000", DSPCopyright))
>> Â Â Â Â Â Â Â printk("[AEDSP16] Warning: non SC-6000 audio card!\n");
>>
>> - Â Â if (aedsp16_dsp_version(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_dsp_version(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_dsp_version: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> - Â Â if (aedsp16_stdcfg(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_stdcfg(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_stdcfg: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â #if defined(CONFIG_SC6600)
>> - Â Â if (aedsp16_hard_read(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_hard_read(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_hard_read: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â aedsp16_hard_decode();
>>
>> Â Â Â aedsp16_hard_encode();
>>
>> - Â Â if (aedsp16_hard_write(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_hard_write(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_hard_write: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> - Â Â if (aedsp16_ext_cfg_write(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_ext_cfg_write(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_ext_cfg_write: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>> Â #endif /* CONFIG_SC6600 */
>>
>> - Â Â if (aedsp16_setup_board(ae_config.base_io) == FALSE) {
>> + Â Â if (aedsp16_setup_board(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â printk("[AEDSP16] aedsp16_setup_board: failed!\n");
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â }
>>
>> Â Â Â if (ae_config.mss_base != -1) {
>> Â Â Â Â Â Â Â if (ae_config.init & INIT_MSS) {
>> - Â Â Â Â Â Â Â Â Â Â if (aedsp16_init_mss(ae_config.base_io) == FALSE) {
>> + Â Â Â Â Â Â Â Â Â Â if (aedsp16_init_mss(ae_config.base_io) == false) {
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â printk("[AEDSP16] Can not initialize"
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â "Microsoft Sound System mode.\n");
>> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â Â Â Â Â }
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>> @@ -1124,27 +1116,27 @@ static int __init aedsp16_init_board(void)
>>
>> Â Â Â mdelay(10);
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> -static int __init init_aedsp16_sb(void)
>> +static bool __init init_aedsp16_sb(void)
>> Â {
>> Â Â Â DBG(("init_aedsp16_sb: "));
>>
>> -/*
>> - * If the card is already init'ed MSS, we can not init it to SBPRO too
>> - * because the board can not emulate simultaneously MSS and SBPRO.
>> - */
>> + Â Â /*
>> + Â Â Â * If the card is already init'ed MSS, we can not init it to SBPRO too
>> + Â Â Â * because the board can not emulate simultaneously MSS and SBPRO.
>> + Â Â Â */
>> Â Â Â if (ae_config.init & INIT_MSS)
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â if (ae_config.init & INIT_SBPRO)
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>>
>> Â Â Â ae_config.init |= INIT_SBPRO;
>>
>> Â Â Â DBG(("done.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> Â static void uninit_aedsp16_sb(void)
>> @@ -1160,24 +1152,24 @@ static int __init init_aedsp16_mss(void)
>> Â {
>> Â Â Â DBG(("init_aedsp16_mss: "));
>>
>> -/*
>> - * If the card is already init'ed SBPRO, we can not init it to MSS too
>> - * because the board can not emulate simultaneously MSS and SBPRO.
>> - */
>> + Â Â /*
>> + Â Â Â * If the card is already init'ed SBPRO, we can not init it to MSS too
>> + Â Â Â * because the board can not emulate simultaneously MSS and SBPRO.
>> + Â Â Â */
>> Â Â Â if (ae_config.init & INIT_SBPRO)
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>> Â Â Â if (ae_config.init & INIT_MSS)
>> - Â Â Â Â Â Â return FALSE;
>> -/*
>> - * We must allocate the CONFIG_AEDSP16_BASE region too because these are
>> the
>> - * I/O ports to access card's control registers.
>> - */
>> + Â Â Â Â Â Â return false;
>> + Â Â /*
>> + Â Â Â * We must allocate the CONFIG_AEDSP16_BASE region too because these are
>> + Â Â Â * the I/O ports to access card's control registers.
>> + Â Â Â */
>> Â Â Â if (!(ae_config.init & INIT_MPU401)) {
>> Â Â Â Â Â Â Â if (!request_region(ae_config.base_io, IOBASE_REGION_SIZE,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â "aedsp16 (base)")) {
>> Â Â Â Â Â Â Â Â Â Â Â printk(
>> Â Â Â Â Â Â Â Â Â Â Â "AEDSP16 BASE I/O port region is already in use.\n");
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>>
>> @@ -1185,7 +1177,7 @@ static int __init init_aedsp16_mss(void)
>>
>> Â Â Â DBG(("done.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> Â static void uninit_aedsp16_mss(void)
>> @@ -1202,23 +1194,23 @@ static void uninit_aedsp16_mss(void)
>> Â Â Â DBG(("done.\n"));
>> Â }
>>
>> -static int __init init_aedsp16_mpu(void)
>> +static bool __init init_aedsp16_mpu(void)
>> Â {
>> Â Â Â DBG(("init_aedsp16_mpu: "));
>>
>> Â Â Â if (ae_config.init & INIT_MPU401)
>> - Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â return false;
>>
>> -/*
>> - * We must request the CONFIG_AEDSP16_BASE region too because these are the
>> I/O
>> - * ports to access card's control registers.
>> - */
>> + Â Â /*
>> + Â Â Â * We must request the CONFIG_AEDSP16_BASE region too because these are
>> + Â Â Â * the I/O ports to access card's control registers.
>> + Â Â Â */
>> Â Â Â if (!(ae_config.init & (INIT_MSS | INIT_SBPRO))) {
>> Â Â Â Â Â Â Â if (!request_region(ae_config.base_io, IOBASE_REGION_SIZE,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â "aedsp16 (base)")) {
>> Â Â Â Â Â Â Â Â Â Â Â printk(
>> Â Â Â Â Â Â Â Â Â Â Â "AEDSP16 BASE I/O port region is already in use.\n");
>> - Â Â Â Â Â Â Â Â Â Â return FALSE;
>> + Â Â Â Â Â Â Â Â Â Â return false;
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>>
>> @@ -1226,7 +1218,7 @@ static int __init init_aedsp16_mpu(void)
>>
>> Â Â Â DBG(("done.\n"));
>>
>> - Â Â return TRUE;
>> + Â Â return true;
>> Â }
>>
>> Â static void uninit_aedsp16_mpu(void)
>> @@ -1244,40 +1236,40 @@ static void uninit_aedsp16_mpu(void)
>> Â Â Â DBG(("done.\n"));
>> Â }
>>
>> -static int __init init_aedsp16(void)
>> +static bool __init init_aedsp16(void)
>> Â {
>> - Â Â int initialized = FALSE;
>> + Â Â int initialized = false;
>>
>> Â Â Â DBG(("Initializing BASE[0x%x] IRQ[%d] DMA[%d] MIRQ[%d]\n",
>> Â Â Â Â Â Â ae_config.base_io,ae_config.irq,ae_config.dma,ae_config.mpu_irq));
>>
>> Â Â Â if (ae_config.mss_base == -1) {
>> - Â Â Â Â Â Â if (init_aedsp16_sb() == FALSE) {
>> + Â Â Â Â Â Â if (init_aedsp16_sb() == false) {
>> Â Â Â Â Â Â Â Â Â Â Â uninit_aedsp16_sb();
>> Â Â Â Â Â Â Â } else {
>> - Â Â Â Â Â Â Â Â Â Â initialized = TRUE;
>> + Â Â Â Â Â Â Â Â Â Â initialized = true;
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>>
>> Â Â Â if (ae_config.mpu_base != -1) {
>> - Â Â Â Â Â Â if (init_aedsp16_mpu() == FALSE) {
>> + Â Â Â Â Â Â if (init_aedsp16_mpu() == false) {
>> Â Â Â Â Â Â Â Â Â Â Â uninit_aedsp16_mpu();
>> Â Â Â Â Â Â Â } else {
>> - Â Â Â Â Â Â Â Â Â Â initialized = TRUE;
>> + Â Â Â Â Â Â Â Â Â Â initialized = true;
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>>
>> -/*
>> - * In the sequence of init routines, the MSS init MUST be the last!
>> - * This because of the special register programming the MSS mode needs.
>> - * A board reset would disable the MSS mode restoring the default SBPRO
>> - * mode.
>> - */
>> + Â Â /*
>> + Â Â Â * In the sequence of init routines, the MSS init MUST be the last!
>> + Â Â Â * This because of the special register programming the MSS mode needs.
>> + Â Â Â * A board reset would disable the MSS mode restoring the default SBPRO
>> + Â Â Â * mode.
>> + Â Â Â */
>> Â Â Â if (ae_config.mss_base != -1) {
>> - Â Â Â Â Â Â if (init_aedsp16_mss() == FALSE) {
>> + Â Â Â Â Â Â if (init_aedsp16_mss() == false) {
>> Â Â Â Â Â Â Â Â Â Â Â uninit_aedsp16_mss();
>> Â Â Â Â Â Â Â } else {
>> - Â Â Â Â Â Â Â Â Â Â initialized = TRUE;
>> + Â Â Â Â Â Â Â Â Â Â initialized = true;
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>>
>> @@ -1334,7 +1326,7 @@ static int __init do_init_aedsp16(void) {
>> Â Â Â ae_config.mpu_base = mpu_base;
>> Â Â Â ae_config.mpu_irq = mpu_irq;
>>
>> - Â Â if (init_aedsp16() == FALSE) {
>> + Â Â if (init_aedsp16() == false) {
>> Â Â Â Â Â Â Â printk(KERN_ERR "aedsp16: initialization failed\n");
>> Â Â Â Â Â Â Â /*
>> Â Â Â Â Â Â Â Â * XXX
>> --
>> 1.7.5.rc2.4.g4d8b3
>>
>> --
> I think you just did the wrong thing .
Care to explain what thing I did wrong?
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
next prev parent reply other threads:[~2011-04-18 4:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-17 23:24 [PATCH 1/1] sound/oss/aedsp16.c: Remove #define TRUE/FALSE, use bool instead Thiago Farina
2011-04-18 1:03 ` Wanlong Gao
2011-04-18 4:07 ` Thiago Farina [this message]
2011-04-18 5:47 ` wanlong gao
2011-04-20 12:20 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTin-KyduTH4vdFEA-eZYQVGAHRDQpg@mail.gmail.com \
--to=tfransosi@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=fizban@tin.it \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
--cc=wanlong.gao@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox