Made some data 'const'.

diff --git a/comedi/drivers/addi-data/addi_amcc_s5933.h b/comedi/drivers/addi-data/addi_amcc_s5933.h
index ed0b5a3e36fe04562eb3012931d4c1c4563c87c2..113535e0e9104f91559913e6141517cee0958583 100644 (file)
--- a/comedi/drivers/addi-data/addi_amcc_s5933.h
+++ b/comedi/drivers/addi-data/addi_amcc_s5933.h
@@ -244,7 +244,7 @@ struct pcilst_struct {
 
 struct pcilst_struct *amcc_devices;    // ptr to root list of all amcc devices
 
-int i_ADDIDATADeviceID[] = { 0x15B8, 0x10E8 };
+static const int i_ADDIDATADeviceID[] = { 0x15B8, 0x10E8 };
 
 /****************************************************************************/
 

diff --git a/comedi/drivers/addi-data/addi_common.c b/comedi/drivers/addi-data/addi_common.c
index 470c6915cbe39629cbefe1a57316557576860d1f..d51ac2cb9d763cfd4f73e8ee1083867f0fadb996 100644 (file)
--- a/comedi/drivers/addi-data/addi_common.c
+++ b/comedi/drivers/addi-data/addi_common.c
@@ -139,7 +139,7 @@ void fpu_end(void)
 #define COMEDI_SUBD_TTLIO   11 /* Digital Input Output But TTL */
 #endif
 
-static boardtype boardtypes[] = {
+static const boardtype boardtypes[] = {
 #ifdef CONFIG_APCI_3120
        {"apci3120",
                        APCI3120_BOARD_VENDOR_ID,

diff --git a/comedi/drivers/addi-data/addi_common.h b/comedi/drivers/addi-data/addi_common.h
index c25e6f6fbe05ff7ad27deb00755ad2fcfc810a7c..9f1083133adcadaccb7ee433e74aa0a3f25193e4 100644 (file)
--- a/comedi/drivers/addi-data/addi_common.h
+++ b/comedi/drivers/addi-data/addi_common.h
@@ -78,7 +78,7 @@ typedef unsigned int ULONG, *PULONG;  /* 32-bit */
 typedef unsigned int DWORD, *PDWORD;   /* 32-bit */
 typedef unsigned long ULONG_PTR;
 
-typedef comedi_lrange *PRANGE;
+typedef const comedi_lrange *PCRANGE;
 #define LOBYTE(W)                                                               (BYTE         )((W)&0xFF)
 #define HIBYTE(W)                                (BYTE         )(((W)>>8)&0xFF)
 #define MAKEWORD(H,L)                            (USHORT       )((L)|( (H)<<8) )
@@ -120,15 +120,15 @@ typedef struct {
        INT i_NbrAoChannel;     // num of D/A chans
        INT i_AiMaxdata;        // resolution of A/D
        INT i_AoMaxdata;        // resolution of D/A
-       PRANGE pr_AiRangelist;  // rangelist for A/D        
-       PRANGE pr_AoRangelist;  // rangelist for D/A 
+       PCRANGE pr_AiRangelist; // rangelist for A/D        
+       PCRANGE pr_AoRangelist; // rangelist for D/A 
 
        INT i_NbrDiChannel;     // Number of DI channels
        INT i_NbrDoChannel;     // Number of DO channels
        INT i_DoMaxdata;        // data to set all chanels high
 
        INT i_NbrTTLChannel;    // Number of TTL channels
-       PRANGE pr_TTLRangelist; // rangelist for TTL
+       PCRANGE pr_TTLRangelist;        // rangelist for TTL
 
        INT i_Dma;              // dma present or not
        INT i_Timer;            //   timer subdevice present or not     

diff --git a/comedi/drivers/addi-data/hwdrv_APCI1710.h b/comedi/drivers/addi-data/hwdrv_APCI1710.h
index f678eeada6a94b83eddbee1dacfd8898c0a21540..51cfa3401d810f751b068db227fd2a8e8b8ad9b1 100644 (file)
--- a/comedi/drivers/addi-data/hwdrv_APCI1710.h
+++ b/comedi/drivers/addi-data/hwdrv_APCI1710.h
@@ -53,7 +53,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 
 //MODULE INFO STRUCTURE
 
-comedi_lrange range_apci1710_ttl = { 4, {
+static const comedi_lrange range_apci1710_ttl = { 4, {
                        BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2),
@@ -61,7 +61,7 @@ comedi_lrange range_apci1710_ttl = { 4, {
        }
 };
 
-comedi_lrange range_apci1710_ssi = { 4, {
+static const comedi_lrange range_apci1710_ssi = { 4, {
                        BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2),
@@ -69,7 +69,7 @@ comedi_lrange range_apci1710_ssi = { 4, {
        }
 };
 
-comedi_lrange range_apci1710_inccpt = { 4, {
+static const comedi_lrange range_apci1710_inccpt = { 4, {
                        BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2),

diff --git a/comedi/drivers/addi-data/hwdrv_apci16xx.h b/comedi/drivers/addi-data/hwdrv_apci16xx.h
index 4f56eb1c432fb119c2e744f34c4a4f4d06bd4836..03dd22bb43fcd63f8cdd3fd3f98a0bc90e20357a 100755 (executable)
--- a/comedi/drivers/addi-data/hwdrv_apci16xx.h
+++ b/comedi/drivers/addi-data/hwdrv_apci16xx.h
@@ -48,7 +48,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 
 #ifdef __KERNEL__
 
-comedi_lrange range_apci16xx_ttl = { 12,
+static const comedi_lrange range_apci16xx_ttl = { 12,
        {BIP_RANGE(1),
                        BIP_RANGE(1),
                        BIP_RANGE(1),

diff --git a/comedi/drivers/addi-data/hwdrv_apci3120.h b/comedi/drivers/addi-data/hwdrv_apci3120.h
index e7536e51ff539c9822313fd722a8392f294ec408..34a4db66a8d8c57240dab83da52ac58808ebd5ba 100644 (file)
--- a/comedi/drivers/addi-data/hwdrv_apci3120.h
+++ b/comedi/drivers/addi-data/hwdrv_apci3120.h
@@ -59,7 +59,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 // comedi related defines    
 
 //ANALOG INPUT RANGE 
-comedi_lrange range_apci3120_ai = { 8, {
+static const comedi_lrange range_apci3120_ai = { 8, {
                        BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2),
@@ -72,7 +72,7 @@ comedi_lrange range_apci3120_ai = { 8, {
 };
 
 // ANALOG OUTPUT RANGE
-comedi_lrange range_apci3120_ao = { 2, {
+static const comedi_lrange range_apci3120_ao = { 2, {
                        BIP_RANGE(10),
                        UNI_RANGE(10)
        }

diff --git a/comedi/drivers/addi-data/hwdrv_apci3200.h b/comedi/drivers/addi-data/hwdrv_apci3200.h
index e352f476960873f8c02cd5ca53e4aaab24260a7d..1e995568d534418e56fea72225a51eed22f664aa 100644 (file)
--- a/comedi/drivers/addi-data/hwdrv_apci3200.h
+++ b/comedi/drivers/addi-data/hwdrv_apci3200.h
@@ -42,7 +42,7 @@ struct {
        Config_Parameters_Module3, Config_Parameters_Module4;
 
 //ANALOG INPUT RANGE 
-comedi_lrange range_apci3200_ai = { 8, {
+static const comedi_lrange range_apci3200_ai = { 8, {
                        BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2),
@@ -54,7 +54,7 @@ comedi_lrange range_apci3200_ai = { 8, {
        }
 };
 
-comedi_lrange range_apci3300_ai = { 4, {
+static const comedi_lrange range_apci3300_ai = { 4, {
                        UNI_RANGE(10),
                        UNI_RANGE(5),
                        UNI_RANGE(2),

diff --git a/comedi/drivers/addi-data/hwdrv_apci3xxx.h b/comedi/drivers/addi-data/hwdrv_apci3xxx.h
index 0da6dc204ea1878373a49fc991f11c5433d1de86..5ea87897b9733aeb0fdbd577bb02a23fbcbe7b51 100755 (executable)
--- a/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+++ b/comedi/drivers/addi-data/hwdrv_apci3xxx.h
@@ -39,7 +39,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 
 #ifdef __KERNEL__
 
-comedi_lrange range_apci3XXX_ai = { 8, {BIP_RANGE(10),
+static const comedi_lrange range_apci3XXX_ai = { 8, {BIP_RANGE(10),
                        BIP_RANGE(5),
                        BIP_RANGE(2),
                        BIP_RANGE(1),
@@ -49,7 +49,7 @@ comedi_lrange range_apci3XXX_ai = { 8, {BIP_RANGE(10),
        UNI_RANGE(1)}
 };
 
-comedi_lrange range_apci3XXX_ttl = { 12, {BIP_RANGE(1),
+static const comedi_lrange range_apci3XXX_ttl = { 12, {BIP_RANGE(1),
                        BIP_RANGE(1),
                        BIP_RANGE(1),
                        BIP_RANGE(1),
@@ -63,7 +63,7 @@ comedi_lrange range_apci3XXX_ttl = { 12, {BIP_RANGE(1),
        BIP_RANGE(1)}
 };
 
-comedi_lrange range_apci3XXX_ao = { 2, {BIP_RANGE(10),
+static const comedi_lrange range_apci3XXX_ao = { 2, {BIP_RANGE(10),
        UNI_RANGE(10)}
 };
 #endif