Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / char / mwave / 3780i.c

diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c
index 28740046bc83752ffbe3ba47b3ec1a540a8bb648..972c40a19629c73271b10b1042f0b8f3601160d6 100644 (file)
--- a/drivers/char/mwave/3780i.c
+++ b/drivers/char/mwave/3780i.c
@@ -124,7 +124,7 @@ static void dsp3780I_WriteGenCfg(unsigned short usDspBaseIO, unsigned uIndex,
                MKBYTE(rSlaveControl));
 
        rSlaveControl_Save = rSlaveControl;
-       rSlaveControl.ConfigMode = TRUE;
+       rSlaveControl.ConfigMode = true;
 
        PRINTK_2(TRACE_3780I,
                "3780i::dsp3780i_WriteGenCfg entry rSlaveControl+ConfigMode %x\n",
@@ -155,7 +155,7 @@ unsigned char dsp3780I_ReadGenCfg(unsigned short usDspBaseIO,
 
        MKBYTE(rSlaveControl) = InByteDsp(DSP_IsaSlaveControl);
        rSlaveControl_Save = rSlaveControl;
-       rSlaveControl.ConfigMode = TRUE;
+       rSlaveControl.ConfigMode = true;
        OutByteDsp(DSP_IsaSlaveControl, MKBYTE(rSlaveControl));
        OutByteDsp(DSP_ConfigAddress, (unsigned char) uIndex);
        ucValue = InByteDsp(DSP_ConfigData);
@@ -230,7 +230,7 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
                        rUartCfg1.BaseIO = 3;
                        break;
                }
-               rUartCfg2.Enable = TRUE;
+               rUartCfg2.Enable = true;
        }
 
        rHBridgeCfg1.Reserved = rHBridgeCfg2.Reserved = 0;
@@ -238,7 +238,7 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
        rHBridgeCfg1.IrqPulse = pSettings->bDspIrqPulse;
        rHBridgeCfg1.Irq = (unsigned char) pIrqMap[pSettings->usDspIrq];
        rHBridgeCfg1.AccessMode = 1;
-       rHBridgeCfg2.Enable = TRUE;
+       rHBridgeCfg2.Enable = true;
 
 
        rBusmasterCfg2.Reserved = 0;
@@ -278,8 +278,8 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
        * soft-reset active for 10ms.
        */
        rSlaveControl.ClockControl = 0;
-       rSlaveControl.SoftReset = TRUE;
-       rSlaveControl.ConfigMode = FALSE;
+       rSlaveControl.SoftReset = true;
+       rSlaveControl.ConfigMode = false;
        rSlaveControl.Reserved = 0;
 
        PRINTK_4(TRACE_3780I,
@@ -302,7 +302,7 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
        for (i = 0; i < 11; i++)
                udelay(2000);
 
-       rSlaveControl.SoftReset = FALSE;
+       rSlaveControl.SoftReset = false;
        OutWordDsp(DSP_IsaSlaveControl, MKWORD(rSlaveControl));
 
        MKWORD(tval) = InWordDsp(DSP_IsaSlaveControl);
@@ -326,10 +326,10 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
        }
 
 
-       rHBridgeControl.EnableDspInt = FALSE;
-       rHBridgeControl.MemAutoInc = TRUE;
-       rHBridgeControl.IoAutoInc = FALSE;
-       rHBridgeControl.DiagnosticMode = FALSE;
+       rHBridgeControl.EnableDspInt = false;
+       rHBridgeControl.MemAutoInc = true;
+       rHBridgeControl.IoAutoInc = false;
+       rHBridgeControl.DiagnosticMode = false;
 
        PRINTK_3(TRACE_3780I,
                "3780i::dsp3780i_EnableDSP DSP_HBridgeControl %x rHBridgeControl %x\n",
@@ -345,7 +345,7 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,
        ChipID = ReadMsaCfg(DSP_ChipID);
 
        PRINTK_2(TRACE_3780I,
-               "3780i::dsp3780I_EnableDSP exiting bRC=TRUE, ChipID %x\n",
+               "3780i::dsp3780I_EnableDSP exiting bRC=true, ChipID %x\n",
                ChipID);
 
        return 0;
@@ -361,8 +361,8 @@ int dsp3780I_DisableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings)
        PRINTK_1(TRACE_3780I, "3780i::dsp3780i_DisableDSP entry\n");
 
        rSlaveControl.ClockControl = 0;
-       rSlaveControl.SoftReset = TRUE;
-       rSlaveControl.ConfigMode = FALSE;
+       rSlaveControl.SoftReset = true;
+       rSlaveControl.ConfigMode = false;
        rSlaveControl.Reserved = 0;
        spin_lock_irqsave(&dsp_lock, flags);
        OutWordDsp(DSP_IsaSlaveControl, MKWORD(rSlaveControl));
@@ -398,14 +398,14 @@ int dsp3780I_Reset(DSP_3780I_CONFIG_SETTINGS * pSettings)
        PRINTK_2(TRACE_3780I, "3780i::dsp3780i_Reset rHBridgeControl %x\n",
                MKWORD(rHBridgeControl));
 
-       rHBridgeControl.EnableDspInt = FALSE;
+       rHBridgeControl.EnableDspInt = false;
        OutWordDsp(DSP_HBridgeControl, MKWORD(rHBridgeControl));
        spin_unlock_irqrestore(&dsp_lock, flags);
 
        /* Reset the core via the boot domain register */
-       rBootDomain.ResetCore = TRUE;
-       rBootDomain.Halt = TRUE;
-       rBootDomain.NMI = TRUE;
+       rBootDomain.ResetCore = true;
+       rBootDomain.Halt = true;
+       rBootDomain.NMI = true;
        rBootDomain.Reserved = 0;
 
        PRINTK_2(TRACE_3780I, "3780i::dsp3780i_Reset rBootDomain %x\n",
@@ -438,26 +438,26 @@ int dsp3780I_Run(DSP_3780I_CONFIG_SETTINGS * pSettings)
 
 
        /* Transition the core to a running state */
-       rBootDomain.ResetCore = TRUE;
-       rBootDomain.Halt = FALSE;
-       rBootDomain.NMI = TRUE;
+       rBootDomain.ResetCore = true;
+       rBootDomain.Halt = false;
+       rBootDomain.NMI = true;
        rBootDomain.Reserved = 0;
        WriteMsaCfg(DSP_MspBootDomain, MKWORD(rBootDomain));
 
        udelay(5);
 
-       rBootDomain.ResetCore = FALSE;
+       rBootDomain.ResetCore = false;
        WriteMsaCfg(DSP_MspBootDomain, MKWORD(rBootDomain));
        udelay(5);
 
-       rBootDomain.NMI = FALSE;
+       rBootDomain.NMI = false;
        WriteMsaCfg(DSP_MspBootDomain, MKWORD(rBootDomain));
        udelay(5);
 
        /* Enable DSP to PC interrupt */
        spin_lock_irqsave(&dsp_lock, flags);
        MKWORD(rHBridgeControl) = InWordDsp(DSP_HBridgeControl);
-       rHBridgeControl.EnableDspInt = TRUE;
+       rHBridgeControl.EnableDspInt = true;
 
        PRINTK_2(TRACE_3780I, "3780i::dsp3780i_Run rHBridgeControl %x\n",
                MKWORD(rHBridgeControl));
@@ -466,7 +466,7 @@ int dsp3780I_Run(DSP_3780I_CONFIG_SETTINGS * pSettings)
        spin_unlock_irqrestore(&dsp_lock, flags);
 
 
-       PRINTK_1(TRACE_3780I, "3780i::dsp3780i_Run exit bRC=TRUE\n");
+       PRINTK_1(TRACE_3780I, "3780i::dsp3780i_Run exit bRC=true\n");
 
        return 0;
 }
@@ -508,7 +508,7 @@ int dsp3780I_ReadDStore(unsigned short usDspBaseIO, void __user *pvBuffer,
 
 
        PRINTK_1(TRACE_3780I,
-               "3780I::dsp3780I_ReadDStore exit bRC=TRUE\n");
+               "3780I::dsp3780I_ReadDStore exit bRC=true\n");
 
        return 0;
 }
@@ -550,7 +550,7 @@ int dsp3780I_ReadAndClearDStore(unsigned short usDspBaseIO,
 
 
        PRINTK_1(TRACE_3780I,
-               "3780I::dsp3780I_ReadAndClearDStore exit bRC=TRUE\n");
+               "3780I::dsp3780I_ReadAndClearDStore exit bRC=true\n");
 
        return 0;
 }
@@ -592,7 +592,7 @@ int dsp3780I_WriteDStore(unsigned short usDspBaseIO, void __user *pvBuffer,
 
 
        PRINTK_1(TRACE_3780I,
-               "3780I::dsp3780D_WriteDStore exit bRC=TRUE\n");
+               "3780I::dsp3780D_WriteDStore exit bRC=true\n");
 
        return 0;
 }
@@ -640,7 +640,7 @@ int dsp3780I_ReadIStore(unsigned short usDspBaseIO, void __user *pvBuffer,
        }
 
        PRINTK_1(TRACE_3780I,
-               "3780I::dsp3780I_ReadIStore exit bRC=TRUE\n");
+               "3780I::dsp3780I_ReadIStore exit bRC=true\n");
 
        return 0;
 }
@@ -689,7 +689,7 @@ int dsp3780I_WriteIStore(unsigned short usDspBaseIO, void __user *pvBuffer,
        }
 
        PRINTK_1(TRACE_3780I,
-               "3780I::dsp3780I_WriteIStore exit bRC=TRUE\n");
+               "3780I::dsp3780I_WriteIStore exit bRC=true\n");
 
        return 0;
 }
@@ -713,7 +713,7 @@ int dsp3780I_GetIPCSource(unsigned short usDspBaseIO,
        */
        spin_lock_irqsave(&dsp_lock, flags);
        MKWORD(rHBridgeControl) = InWordDsp(DSP_HBridgeControl);
-       rHBridgeControl.EnableDspInt = FALSE;
+       rHBridgeControl.EnableDspInt = false;
        OutWordDsp(DSP_HBridgeControl, MKWORD(rHBridgeControl));
 
        *pusIPCSource = InWordDsp(DSP_Interrupt);
@@ -725,7 +725,7 @@ int dsp3780I_GetIPCSource(unsigned short usDspBaseIO,
 
        OutWordDsp(DSP_Interrupt, (unsigned short) ~(*pusIPCSource));
 
-       rHBridgeControl.EnableDspInt = TRUE;
+       rHBridgeControl.EnableDspInt = true;
        OutWordDsp(DSP_HBridgeControl, MKWORD(rHBridgeControl));
        spin_unlock_irqrestore(&dsp_lock, flags);