[media] rc: Rename remote controller type to rc_type instead of ir_type
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 17 Nov 2010 17:20:52 +0000 (14:20 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 29 Dec 2010 10:16:50 +0000 (08:16 -0200)
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
119 files changed:
drivers/media/dvb/dvb-usb/af9015.c
drivers/media/dvb/dvb-usb/anysee.c
drivers/media/dvb/dvb-usb/dib0700.h
drivers/media/dvb/dvb-usb/dib0700_core.c
drivers/media/dvb/dvb-usb/dib0700_devices.c
drivers/media/dvb/dvb-usb/dvb-usb.h
drivers/media/dvb/mantis/mantis_input.c
drivers/media/dvb/siano/smsir.c
drivers/media/rc/ene_ir.c
drivers/media/rc/imon.c
drivers/media/rc/ir-jvc-decoder.c
drivers/media/rc/ir-lirc-codec.c
drivers/media/rc/ir-nec-decoder.c
drivers/media/rc/ir-rc5-decoder.c
drivers/media/rc/ir-rc5-sz-decoder.c
drivers/media/rc/ir-rc6-decoder.c
drivers/media/rc/ir-sony-decoder.c
drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
drivers/media/rc/keymaps/rc-alink-dtu-m.c
drivers/media/rc/keymaps/rc-anysee.c
drivers/media/rc/keymaps/rc-apac-viewcomp.c
drivers/media/rc/keymaps/rc-asus-pc39.c
drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
drivers/media/rc/keymaps/rc-avermedia-a16d.c
drivers/media/rc/keymaps/rc-avermedia-cardbus.c
drivers/media/rc/keymaps/rc-avermedia-dvbt.c
drivers/media/rc/keymaps/rc-avermedia-m135a.c
drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
drivers/media/rc/keymaps/rc-avermedia.c
drivers/media/rc/keymaps/rc-avertv-303.c
drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
drivers/media/rc/keymaps/rc-behold-columbus.c
drivers/media/rc/keymaps/rc-behold.c
drivers/media/rc/keymaps/rc-budget-ci-old.c
drivers/media/rc/keymaps/rc-cinergy-1400.c
drivers/media/rc/keymaps/rc-cinergy.c
drivers/media/rc/keymaps/rc-dib0700-nec.c
drivers/media/rc/keymaps/rc-dib0700-rc5.c
drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
drivers/media/rc/keymaps/rc-digittrade.c
drivers/media/rc/keymaps/rc-dm1105-nec.c
drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
drivers/media/rc/keymaps/rc-em-terratec.c
drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
drivers/media/rc/keymaps/rc-encore-enltv.c
drivers/media/rc/keymaps/rc-encore-enltv2.c
drivers/media/rc/keymaps/rc-evga-indtube.c
drivers/media/rc/keymaps/rc-eztv.c
drivers/media/rc/keymaps/rc-flydvb.c
drivers/media/rc/keymaps/rc-flyvideo.c
drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
drivers/media/rc/keymaps/rc-gadmei-rm008z.c
drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
drivers/media/rc/keymaps/rc-gotview7135.c
drivers/media/rc/keymaps/rc-hauppauge-new.c
drivers/media/rc/keymaps/rc-imon-mce.c
drivers/media/rc/keymaps/rc-imon-pad.c
drivers/media/rc/keymaps/rc-iodata-bctv7e.c
drivers/media/rc/keymaps/rc-kaiomy.c
drivers/media/rc/keymaps/rc-kworld-315u.c
drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
drivers/media/rc/keymaps/rc-lirc.c
drivers/media/rc/keymaps/rc-lme2510.c
drivers/media/rc/keymaps/rc-manli.c
drivers/media/rc/keymaps/rc-msi-digivox-ii.c
drivers/media/rc/keymaps/rc-msi-digivox-iii.c
drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
drivers/media/rc/keymaps/rc-msi-tvanywhere.c
drivers/media/rc/keymaps/rc-nebula.c
drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
drivers/media/rc/keymaps/rc-norwood.c
drivers/media/rc/keymaps/rc-npgtech.c
drivers/media/rc/keymaps/rc-pctv-sedna.c
drivers/media/rc/keymaps/rc-pinnacle-color.c
drivers/media/rc/keymaps/rc-pinnacle-grey.c
drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
drivers/media/rc/keymaps/rc-pixelview-mk12.c
drivers/media/rc/keymaps/rc-pixelview-new.c
drivers/media/rc/keymaps/rc-pixelview.c
drivers/media/rc/keymaps/rc-powercolor-real-angel.c
drivers/media/rc/keymaps/rc-proteus-2309.c
drivers/media/rc/keymaps/rc-purpletv.c
drivers/media/rc/keymaps/rc-pv951.c
drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
drivers/media/rc/keymaps/rc-rc5-tv.c
drivers/media/rc/keymaps/rc-rc6-mce.c
drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
drivers/media/rc/keymaps/rc-streamzap.c
drivers/media/rc/keymaps/rc-tbs-nec.c
drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
drivers/media/rc/keymaps/rc-terratec-slim.c
drivers/media/rc/keymaps/rc-tevii-nec.c
drivers/media/rc/keymaps/rc-total-media-in-hand.c
drivers/media/rc/keymaps/rc-trekstor.c
drivers/media/rc/keymaps/rc-tt-1500.c
drivers/media/rc/keymaps/rc-twinhan1027.c
drivers/media/rc/keymaps/rc-videomate-s350.c
drivers/media/rc/keymaps/rc-videomate-tv-pvr.c
drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
drivers/media/rc/keymaps/rc-winfast.c
drivers/media/rc/mceusb.c
drivers/media/rc/nuvoton-cir.c
drivers/media/rc/rc-main.c
drivers/media/rc/streamzap.c
drivers/media/video/cx18/cx18-i2c.c
drivers/media/video/cx231xx/cx231xx-input.c
drivers/media/video/cx23885/cx23885-input.c
drivers/media/video/cx88/cx88-input.c
drivers/media/video/em28xx/em28xx-input.c
drivers/media/video/ir-kbd-i2c.c
drivers/media/video/ivtv/ivtv-i2c.c
drivers/media/video/saa7134/saa7134-input.c
drivers/staging/tm6000/tm6000-input.c
include/media/ir-kbd-i2c.h
include/media/rc-core.h
include/media/rc-map.h

index bc2a6e464ceadde41c310add5fa2416e5fcf0082..8671ca362c81f858f0a644ddf461c347e7974b80 100644 (file)
@@ -1344,11 +1344,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
 
                .rc.core = {
-                       .protocol         = IR_TYPE_NEC,
+                       .protocol         = RC_TYPE_NEC,
                        .module_name      = "af9015",
                        .rc_query         = af9015_rc_query,
                        .rc_interval      = AF9015_RC_INTERVAL,
-                       .allowed_protos   = IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_NEC,
                },
 
                .i2c_algo = &af9015_i2c_algo,
@@ -1472,11 +1472,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
 
                .rc.core = {
-                       .protocol         = IR_TYPE_NEC,
+                       .protocol         = RC_TYPE_NEC,
                        .module_name      = "af9015",
                        .rc_query         = af9015_rc_query,
                        .rc_interval      = AF9015_RC_INTERVAL,
-                       .allowed_protos   = IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_NEC,
                },
 
                .i2c_algo = &af9015_i2c_algo,
@@ -1584,11 +1584,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                .identify_state = af9015_identify_state,
 
                .rc.core = {
-                       .protocol         = IR_TYPE_NEC,
+                       .protocol         = RC_TYPE_NEC,
                        .module_name      = "af9015",
                        .rc_query         = af9015_rc_query,
                        .rc_interval      = AF9015_RC_INTERVAL,
-                       .allowed_protos   = IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_NEC,
                },
 
                .i2c_algo = &af9015_i2c_algo,
index 5e12488f3c7665d7677dbe92af0b07c8e57cde71..6b402e943539e03a348e6d8bc762374cd1007d4f 100644 (file)
@@ -476,7 +476,7 @@ static struct dvb_usb_device_properties anysee_properties = {
 
        .rc.core = {
                .rc_codes         = RC_MAP_ANYSEE,
-               .protocol         = IR_TYPE_OTHER,
+               .protocol         = RC_TYPE_OTHER,
                .module_name      = "anysee",
                .rc_query         = anysee_rc_query,
                .rc_interval      = 250,  /* windows driver uses 500ms */
index 1e7d780332b561b127801b7f2c396f4c7e892639..3537d65c04bc02ad6a417b94eeba872cb3a82b2f 100644 (file)
@@ -60,7 +60,7 @@ extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
 extern struct i2c_algorithm dib0700_i2c_algo;
 extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
                        struct dvb_usb_device_description **desc, int *cold);
-extern int dib0700_change_protocol(struct rc_dev *dev, u64 ir_type);
+extern int dib0700_change_protocol(struct rc_dev *dev, u64 rc_type);
 
 extern int dib0700_device_count;
 extern int dvb_usb_dib0700_ir_proto;
index 1dd119e7b67684712fbda7b423bfe6a06963a0a9..8ca48f76dfa98dabba32e4af6175ff9e23066fcd 100644 (file)
@@ -471,7 +471,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
        return dib0700_ctrl_wr(adap->dev, b, 4);
 }
 
-int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
+int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
 {
        struct dvb_usb_device *d = rc->priv;
        struct dib0700_state *st = d->priv;
@@ -479,11 +479,11 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
        int new_proto, ret;
 
        /* Set the IR mode */
-       if (ir_type == IR_TYPE_RC5)
+       if (rc_type == RC_TYPE_RC5)
                new_proto = 1;
-       else if (ir_type == IR_TYPE_NEC)
+       else if (rc_type == RC_TYPE_NEC)
                new_proto = 0;
-       else if (ir_type == IR_TYPE_RC6) {
+       else if (rc_type == RC_TYPE_RC6) {
                if (st->fw_version < 0x10200)
                        return -EINVAL;
 
@@ -499,7 +499,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
                return ret;
        }
 
-       d->props.rc.core.protocol = ir_type;
+       d->props.rc.core.protocol = rc_type;
 
        return ret;
 }
@@ -562,7 +562,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                 purb->actual_length);
 
        switch (d->props.rc.core.protocol) {
-       case IR_TYPE_NEC:
+       case RC_TYPE_NEC:
                toggle = 0;
 
                /* NEC protocol sends repeat code as 0 0 0 FF */
index 9ac920d0483e82301749073fb86fd1a1e03367d0..defd83964ce25556d47d6e3b3241d8b61eb65719 100644 (file)
@@ -510,7 +510,7 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
 
        d->last_event = 0;
        switch (d->props.rc.core.protocol) {
-       case IR_TYPE_NEC:
+       case RC_TYPE_NEC:
                /* NEC protocol sends repeat code as 0 0 0 FF */
                if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
                    (key[3] == 0xff))
@@ -1924,9 +1924,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_interval      = DEFAULT_RC_INTERVAL,
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1958,9 +1958,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_interval      = DEFAULT_RC_INTERVAL,
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2017,9 +2017,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_interval      = DEFAULT_RC_INTERVAL,
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2059,9 +2059,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2135,9 +2135,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2179,9 +2179,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2247,9 +2247,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2294,9 +2294,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2363,9 +2363,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2399,9 +2399,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2467,9 +2467,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2511,9 +2511,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_NEC_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2560,9 +2560,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -2597,9 +2597,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
                        .module_name      = "dib0700",
                        .rc_query         = dib0700_rc_query_old_firmware,
-                       .allowed_protos   = IR_TYPE_RC5 |
-                                           IR_TYPE_RC6 |
-                                           IR_TYPE_NEC,
+                       .allowed_protos   = RC_TYPE_RC5 |
+                                           RC_TYPE_RC6 |
+                                           RC_TYPE_NEC,
                        .change_protocol  = dib0700_change_protocol,
                },
        },
index 18828cb282c45821f619dcceca5189a4e65d1401..95b1603d5be842f817b5fd6faa1edfd4dd054a6c 100644 (file)
@@ -190,7 +190,7 @@ struct dvb_rc {
        char *rc_codes;
        u64 protocol;
        u64 allowed_protos;
-       int (*change_protocol)(struct rc_dev *dev, u64 ir_type);
+       int (*change_protocol)(struct rc_dev *dev, u64 rc_type);
        char *module_name;
        int (*rc_query) (struct dvb_usb_device *d);
        int rc_interval;
index e030b18ad6d9bf204f5b6cfaab83c8b77e7d0f51..cf5f8ca6f6853d864a29f38cde871231f817724a 100644 (file)
@@ -99,7 +99,7 @@ static struct rc_keymap ir_mantis_map = {
        .map = {
                .scan = mantis_ir_table,
                .size = ARRAY_SIZE(mantis_ir_table),
-               .ir_type = IR_TYPE_UNKNOWN,
+               .rc_type = RC_TYPE_UNKNOWN,
                .name = RC_MAP_MANTIS,
        }
 };
index ebd73059b518f88985b6a7de42bd4226acd6b3c2..37bc5c4b8ad87541e568a3c968635d0b8a289318 100644 (file)
@@ -88,7 +88,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
 
        dev->priv = coredev;
        dev->driver_type = RC_DRIVER_IR_RAW;
-       dev->allowed_protos = IR_TYPE_ALL;
+       dev->allowed_protos = RC_TYPE_ALL;
        dev->map_name = sms_get_board(board_id)->rc_codes;
        dev->driver_name = MODULE_NAME;
 
index 1ace4581f157436bbe931b9ab33d3198bfc0cfe5..80b3c319f69814e95b8b76740a76acb662281dc3 100644 (file)
@@ -1052,7 +1052,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
                learning_mode_force = false;
 
        rdev->driver_type = RC_DRIVER_IR_RAW;
-       rdev->allowed_protos = IR_TYPE_ALL;
+       rdev->allowed_protos = RC_TYPE_ALL;
        rdev->priv = dev;
        rdev->open = ene_open;
        rdev->close = ene_close;
index d67573edb052e5d7b25ee841aa53d75104e08667..de9dc0e202d5d671717f2c8ba517522dda1a6f0e 100644 (file)
@@ -131,7 +131,7 @@ struct imon_context {
        u32 last_keycode;               /* last reported input keycode */
        u32 rc_scancode;                /* the computed remote scancode */
        u8 rc_toggle;                   /* the computed remote toggle bit */
-       u64 ir_type;                    /* iMON or MCE (RC6) IR protocol? */
+       u64 rc_type;                    /* iMON or MCE (RC6) IR protocol? */
        bool release_code;              /* some keys send a release code */
 
        u8 display_type;                /* store the display type */
@@ -983,7 +983,7 @@ static void imon_touch_display_timeout(unsigned long data)
  * really just RC-6), but only one or the other at a time, as the signals
  * are decoded onboard the receiver.
  */
-static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
+static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
 {
        int retval;
        struct imon_context *ictx = rc->priv;
@@ -992,18 +992,18 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
        unsigned char ir_proto_packet[] = {
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
 
-       if (ir_type && !(ir_type & rc->allowed_protos))
+       if (rc_type && !(rc_type & rc->allowed_protos))
                dev_warn(dev, "Looks like you're trying to use an IR protocol "
                         "this device does not support\n");
 
-       switch (ir_type) {
-       case IR_TYPE_RC6:
+       switch (rc_type) {
+       case RC_TYPE_RC6:
                dev_dbg(dev, "Configuring IR receiver for MCE protocol\n");
                ir_proto_packet[0] = 0x01;
                pad_mouse = false;
                break;
-       case IR_TYPE_UNKNOWN:
-       case IR_TYPE_OTHER:
+       case RC_TYPE_UNKNOWN:
+       case RC_TYPE_OTHER:
                dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
                if (pad_stabilize && !nomouse)
                        pad_mouse = true;
@@ -1012,7 +1012,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
                        pad_mouse = false;
                }
                /* ir_proto_packet[0] = 0x00; // already the default */
-               ir_type = IR_TYPE_OTHER;
+               rc_type = RC_TYPE_OTHER;
                break;
        default:
                dev_warn(dev, "Unsupported IR protocol specified, overriding "
@@ -1024,7 +1024,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
                        pad_mouse = false;
                }
                /* ir_proto_packet[0] = 0x00; // already the default */
-               ir_type = IR_TYPE_OTHER;
+               rc_type = RC_TYPE_OTHER;
                break;
        }
 
@@ -1034,7 +1034,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
        if (retval)
                goto out;
 
-       ictx->ir_type = ir_type;
+       ictx->rc_type = rc_type;
        ictx->pad_mouse = pad_mouse;
 
 out:
@@ -1306,7 +1306,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
                rel_x = buf[2];
                rel_y = buf[3];
 
-               if (ictx->ir_type == IR_TYPE_OTHER && pad_stabilize) {
+               if (ictx->rc_type == RC_TYPE_OTHER && pad_stabilize) {
                        if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
                                dir = stabilize((int)rel_x, (int)rel_y,
                                                timeout, threshold);
@@ -1373,7 +1373,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
                buf[0] = 0x01;
                buf[1] = buf[4] = buf[5] = buf[6] = buf[7] = 0;
 
-               if (ictx->ir_type == IR_TYPE_OTHER && pad_stabilize) {
+               if (ictx->rc_type == RC_TYPE_OTHER && pad_stabilize) {
                        dir = stabilize((int)rel_x, (int)rel_y,
                                        timeout, threshold);
                        if (!dir) {
@@ -1495,7 +1495,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
                kc = imon_panel_key_lookup(scancode);
        } else {
                scancode = be32_to_cpu(*((u32 *)buf));
-               if (ictx->ir_type == IR_TYPE_RC6) {
+               if (ictx->rc_type == RC_TYPE_RC6) {
                        ktype = IMON_KEY_IMON;
                        if (buf[0] == 0x80)
                                ktype = IMON_KEY_MCE;
@@ -1709,7 +1709,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
 {
        u8 ffdc_cfg_byte = ictx->usb_rx_buf[6];
        u8 detected_display_type = IMON_DISPLAY_TYPE_NONE;
-       u64 allowed_protos = IR_TYPE_OTHER;
+       u64 allowed_protos = RC_TYPE_OTHER;
 
        switch (ffdc_cfg_byte) {
        /* iMON Knob, no display, iMON IR + vol knob */
@@ -1738,13 +1738,13 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
        case 0x9e:
                dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");
                detected_display_type = IMON_DISPLAY_TYPE_VFD;
-               allowed_protos = IR_TYPE_RC6;
+               allowed_protos = RC_TYPE_RC6;
                break;
        /* iMON LCD, MCE IR */
        case 0x9f:
                dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR");
                detected_display_type = IMON_DISPLAY_TYPE_LCD;
-               allowed_protos = IR_TYPE_RC6;
+               allowed_protos = RC_TYPE_RC6;
                break;
        default:
                dev_info(ictx->dev, "Unknown 0xffdc device, "
@@ -1757,7 +1757,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
 
        ictx->display_type = detected_display_type;
        ictx->rdev->allowed_protos = allowed_protos;
-       ictx->ir_type = allowed_protos;
+       ictx->rc_type = allowed_protos;
 }
 
 static void imon_set_display_type(struct imon_context *ictx)
@@ -1836,10 +1836,10 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
 
        rdev->priv = ictx;
        rdev->driver_type = RC_DRIVER_SCANCODE;
-       rdev->allowed_protos = IR_TYPE_OTHER | IR_TYPE_RC6; /* iMON PAD or MCE */
+       rdev->allowed_protos = RC_TYPE_OTHER | RC_TYPE_RC6; /* iMON PAD or MCE */
        rdev->change_protocol = imon_ir_change_protocol;
        rdev->driver_name = MOD_NAME;
-       if (ictx->ir_type == IR_TYPE_RC6)
+       if (ictx->rc_type == RC_TYPE_RC6)
                rdev->map_name = RC_MAP_IMON_MCE;
        else
                rdev->map_name = RC_MAP_IMON_PAD;
index 09c143ff33f3b91dc0c06df1c5b4544526455fc5..624449afaa61744f406b06391946f4e21aa6b33c 100644 (file)
@@ -46,7 +46,7 @@ static int ir_jvc_decode(struct rc_dev *dev, struct ir_raw_event ev)
 {
        struct jvc_dec *data = &dev->raw->jvc;
 
-       if (!(dev->raw->enabled_protocols & IR_TYPE_JVC))
+       if (!(dev->raw->enabled_protocols & RC_TYPE_JVC))
                return 0;
 
        if (!is_timing_event(ev)) {
@@ -173,7 +173,7 @@ out:
 }
 
 static struct ir_raw_handler jvc_handler = {
-       .protocols      = IR_TYPE_JVC,
+       .protocols      = RC_TYPE_JVC,
        .decode         = ir_jvc_decode,
 };
 
index f9086c5ba8b1ddb7ee067b1f979b2005c430322d..1e87ee8e5c990ce6d6867cad8e09d18e3a0fdafd 100644 (file)
@@ -34,7 +34,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
        struct lirc_codec *lirc = &dev->raw->lirc;
        int sample;
 
-       if (!(dev->raw->enabled_protocols & IR_TYPE_LIRC))
+       if (!(dev->raw->enabled_protocols & RC_TYPE_LIRC))
                return 0;
 
        if (!dev->raw->lirc.drv || !dev->raw->lirc.drv->rbuf)
@@ -373,7 +373,7 @@ static int ir_lirc_unregister(struct rc_dev *dev)
 }
 
 static struct ir_raw_handler lirc_handler = {
-       .protocols      = IR_TYPE_LIRC,
+       .protocols      = RC_TYPE_LIRC,
        .decode         = ir_lirc_decode,
        .raw_register   = ir_lirc_register,
        .raw_unregister = ir_lirc_unregister,
index 235d774d0ec2984f08888cca49f566f81db7b3a9..5d15c31288b9cb0be8c8d478edcdc5b320c89399 100644 (file)
@@ -50,7 +50,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u32 scancode;
        u8 address, not_address, command, not_command;
 
-       if (!(dev->raw->enabled_protocols & IR_TYPE_NEC))
+       if (!(dev->raw->enabled_protocols & RC_TYPE_NEC))
                return 0;
 
        if (!is_timing_event(ev)) {
@@ -190,7 +190,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
 }
 
 static struct ir_raw_handler nec_handler = {
-       .protocols      = IR_TYPE_NEC,
+       .protocols      = RC_TYPE_NEC,
        .decode         = ir_nec_decode,
 };
 
index 779ab0d0a2859eabb3f5c9ecca6ce1d986b4bc1d..ebdba55399167a78261e4a45d2d4cb64237d4d7c 100644 (file)
@@ -51,7 +51,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u8 toggle;
        u32 scancode;
 
-        if (!(dev->raw->enabled_protocols & IR_TYPE_RC5))
+        if (!(dev->raw->enabled_protocols & RC_TYPE_RC5))
                 return 0;
 
        if (!is_timing_event(ev)) {
@@ -163,7 +163,7 @@ out:
 }
 
 static struct ir_raw_handler rc5_handler = {
-       .protocols      = IR_TYPE_RC5,
+       .protocols      = RC_TYPE_RC5,
        .decode         = ir_rc5_decode,
 };
 
index 5586bf20c8d7738e9b2553b9338789a6697a1542..90aa8868629adccee354300504fe53fd9f5131ed 100644 (file)
@@ -47,7 +47,7 @@ static int ir_rc5_sz_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u8 toggle, command, system;
        u32 scancode;
 
-        if (!(dev->raw->enabled_protocols & IR_TYPE_RC5_SZ))
+        if (!(dev->raw->enabled_protocols & RC_TYPE_RC5_SZ))
                 return 0;
 
        if (!is_timing_event(ev)) {
@@ -127,7 +127,7 @@ out:
 }
 
 static struct ir_raw_handler rc5_sz_handler = {
-       .protocols      = IR_TYPE_RC5_SZ,
+       .protocols      = RC_TYPE_RC5_SZ,
        .decode         = ir_rc5_sz_decode,
 };
 
index 88d948728c2fb21674ccdb9fa8b7416c5713b78d..755dafa3871bf1be6f15025f6d775c2be75e6594 100644 (file)
@@ -81,7 +81,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u32 scancode;
        u8 toggle;
 
-       if (!(dev->raw->enabled_protocols & IR_TYPE_RC6))
+       if (!(dev->raw->enabled_protocols & RC_TYPE_RC6))
                return 0;
 
        if (!is_timing_event(ev)) {
@@ -255,7 +255,7 @@ out:
 }
 
 static struct ir_raw_handler rc6_handler = {
-       .protocols      = IR_TYPE_RC6,
+       .protocols      = RC_TYPE_RC6,
        .decode         = ir_rc6_decode,
 };
 
index 5292b89f8de2b11c7276f6b6bbfc1f657b111be5..a92de80c48db7b4e48b64fead5353a7a9eed6083 100644 (file)
@@ -44,7 +44,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u32 scancode;
        u8 device, subdevice, function;
 
-       if (!(dev->raw->enabled_protocols & IR_TYPE_SONY))
+       if (!(dev->raw->enabled_protocols & RC_TYPE_SONY))
                return 0;
 
        if (!is_timing_event(ev)) {
@@ -156,7 +156,7 @@ out:
 }
 
 static struct ir_raw_handler sony_handler = {
-       .protocols      = IR_TYPE_SONY,
+       .protocols      = RC_TYPE_SONY,
        .decode         = ir_sony_decode,
 };
 
index b17283176ecdc173110aa67a78c88db2aea5aa94..0ea0aeee6e7846f68720b5d4e625bbca7abb392e 100644 (file)
@@ -67,7 +67,7 @@ static struct rc_keymap adstech_dvb_t_pci_map = {
        .map = {
                .scan    = adstech_dvb_t_pci,
                .size    = ARRAY_SIZE(adstech_dvb_t_pci),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_ADSTECH_DVB_T_PCI,
        }
 };
index ddfee7f8093d90200a03423abdcd6e4b3c2c3aac..b0ec1c81a080b2dd024302661d5974f0d22887aa 100644 (file)
@@ -46,7 +46,7 @@ static struct rc_keymap alink_dtu_m_map = {
        .map = {
                .scan    = alink_dtu_m,
                .size    = ARRAY_SIZE(alink_dtu_m),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_ALINK_DTU_M,
        }
 };
index 30d70498cfed608dfa7a44a29a56d4bccffde971..9bfe60e663b43813ef88167ec2022a83c2c2757a 100644 (file)
@@ -71,7 +71,7 @@ static struct rc_keymap anysee_map = {
        .map = {
                .scan    = anysee,
                .size    = ARRAY_SIZE(anysee),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_ANYSEE,
        }
 };
index 0ef2b562baf0f39d42a3c700c26030b8984b2f7b..a32840dd4df49c311405a9172538e1bd3fca8423 100644 (file)
@@ -58,7 +58,7 @@ static struct rc_keymap apac_viewcomp_map = {
        .map = {
                .scan    = apac_viewcomp,
                .size    = ARRAY_SIZE(apac_viewcomp),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_APAC_VIEWCOMP,
        }
 };
index 2996e0a3b8d58caa2f0254ed576f0fe67665e148..f86bfb7bf271aaee81cb4a2641d25b1db70c2d6e 100644 (file)
@@ -69,7 +69,7 @@ static struct rc_keymap asus_pc39_map = {
        .map = {
                .scan    = asus_pc39,
                .size    = ARRAY_SIZE(asus_pc39),
-               .ir_type = IR_TYPE_RC5,
+               .rc_type = RC_TYPE_RC5,
                .name    = RC_MAP_ASUS_PC39,
        }
 };
index 8edfd293d01003b7a3ac6d9e8497e7276cd10268..0cefe1c5536d922bdcbaabf3a6972980ad89066e 100644 (file)
@@ -47,7 +47,7 @@ static struct rc_keymap ati_tv_wonder_hd_600_map = {
        .map = {
                .scan    = ati_tv_wonder_hd_600,
                .size    = ARRAY_SIZE(ati_tv_wonder_hd_600),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_ATI_TV_WONDER_HD_600,
        }
 };
index 12f043587f2ec871519a9eb37117ea2422308230..43525c8c111a6ab083e0ac625fe1f61b969884b3 100644 (file)
@@ -53,7 +53,7 @@ static struct rc_keymap avermedia_a16d_map = {
        .map = {
                .scan    = avermedia_a16d,
                .size    = ARRAY_SIZE(avermedia_a16d),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_AVERMEDIA_A16D,
        }
 };
index 2a945b02e8cae126acac04ee5249d20add610c55..2d528cac2caf0e0a28aed8b767ca3bd00cee4344 100644 (file)
@@ -75,7 +75,7 @@ static struct rc_keymap avermedia_cardbus_map = {
        .map = {
                .scan    = avermedia_cardbus,
                .size    = ARRAY_SIZE(avermedia_cardbus),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_AVERMEDIA_CARDBUS,
        }
 };
index 39dde62228757b843c2a3933ccf00b0564e09c1c..e45b67ffcf3fced7ef44af5ec8c4c3baefedae76 100644 (file)
@@ -56,7 +56,7 @@ static struct rc_keymap avermedia_dvbt_map = {
        .map = {
                .scan    = avermedia_dvbt,
                .size    = ARRAY_SIZE(avermedia_dvbt),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_AVERMEDIA_DVBT,
        }
 };
index e4471fb2ad1e2d8558df0d7e721845a52e367ae3..d5622c507d5f285e9c28c858df51f4b640f84a62 100644 (file)
@@ -125,7 +125,7 @@ static struct rc_keymap avermedia_m135a_map = {
        .map = {
                .scan    = avermedia_m135a,
                .size    = ARRAY_SIZE(avermedia_m135a),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_AVERMEDIA_M135A,
        }
 };
index cf8d45717cb3e18619d4d1f97cf392559a27ae68..b0e10bec82b2ebba2c46fe0558f018c9d59a64f8 100644 (file)
@@ -73,7 +73,7 @@ static struct rc_keymap avermedia_m733a_rm_k6_map = {
        .map = {
                .scan    = avermedia_m733a_rm_k6,
                .size    = ARRAY_SIZE(avermedia_m733a_rm_k6),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_AVERMEDIA_M733A_RM_K6,
        }
 };
index 9ee60906c8618d4b7541d6cc254bd14d41c718ff..334846654a55193bb6e58e8ea15678a9debc9a9f 100644 (file)
@@ -57,7 +57,7 @@ static struct rc_keymap avermedia_rm_ks_map = {
        .map = {
                .scan    = avermedia_rm_ks,
                .size    = ARRAY_SIZE(avermedia_rm_ks),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_AVERMEDIA_RM_KS,
        }
 };
index 21effd5bfb0da801a92c3f2f555d38bb5f405066..cfde54e15d5cc75e121ce558fff39b6036708ea7 100644 (file)
@@ -64,7 +64,7 @@ static struct rc_keymap avermedia_map = {
        .map = {
                .scan    = avermedia,
                .size    = ARRAY_SIZE(avermedia),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_AVERMEDIA,
        }
 };
index 971c59d6f9d60f1e496c7e817fe1ca9558834c6a..ae586632b48e6e28e1789e245183789eb24be9f8 100644 (file)
@@ -63,7 +63,7 @@ static struct rc_keymap avertv_303_map = {
        .map = {
                .scan    = avertv_303,
                .size    = ARRAY_SIZE(avertv_303),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_AVERTV_303,
        }
 };
index e0876147d471968be91a8cd0af396fc743fe1867..579fafedd35ac6a72ad07cf8d41eb7ab0d9c7843 100644 (file)
@@ -80,7 +80,7 @@ static struct rc_keymap azurewave_ad_tu700_map = {
        .map = {
                .scan    = azurewave_ad_tu700,
                .size    = ARRAY_SIZE(azurewave_ad_tu700),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_AZUREWAVE_AD_TU700,
        }
 };
index 9f56c98fef5b94d4f8e356296e61ae380dc67e85..6abb712c9e04448c5b40315cb7a7d22b4dd303de 100644 (file)
@@ -86,7 +86,7 @@ static struct rc_keymap behold_columbus_map = {
        .map = {
                .scan    = behold_columbus,
                .size    = ARRAY_SIZE(behold_columbus),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_BEHOLD_COLUMBUS,
        }
 };
index abc140b2098b505c4c6556f2202fdb251e95e17c..5694185a869d9287dd9d43fa0630f96728b36aa0 100644 (file)
@@ -119,7 +119,7 @@ static struct rc_keymap behold_map = {
        .map = {
                .scan    = behold,
                .size    = ARRAY_SIZE(behold),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_BEHOLD,
        }
 };
index 64c2ac913338bd61e03114943b32851a9e31f408..99f73232c714f781fed4c92bb28f830010c103d3 100644 (file)
@@ -70,7 +70,7 @@ static struct rc_keymap budget_ci_old_map = {
        .map = {
                .scan    = budget_ci_old,
                .size    = ARRAY_SIZE(budget_ci_old),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_BUDGET_CI_OLD,
        }
 };
index 074f2c2c2c61b3c0c70d8b54b1cf4a19991c4248..b504ddd1a92293bc64cf6ea34243dc6a6dc8dd8d 100644 (file)
@@ -62,7 +62,7 @@ static struct rc_keymap cinergy_1400_map = {
        .map = {
                .scan    = cinergy_1400,
                .size    = ARRAY_SIZE(cinergy_1400),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_CINERGY_1400,
        }
 };
index cf84c3dba742e15437cb5c08bcd77ef34637959a..8bf02f154339f0d85ae80c2016c190fc5e3ffd72 100644 (file)
@@ -56,7 +56,7 @@ static struct rc_keymap cinergy_map = {
        .map = {
                .scan    = cinergy,
                .size    = ARRAY_SIZE(cinergy),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_CINERGY,
        }
 };
index ae1832038fbe2300edf88056cebcef97ac1ac6a6..47d5476d50e8077b89ce0fe13be9c091396df719 100644 (file)
@@ -102,7 +102,7 @@ static struct rc_keymap dib0700_nec_map = {
        .map = {
                .scan    = dib0700_nec_table,
                .size    = ARRAY_SIZE(dib0700_nec_table),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_DIB0700_NEC_TABLE,
        }
 };
index 4a4797cfd77d7a66f64114f7a61e8539296ed23b..1d09921f076f299790070ab7a06fe58b9d2a5904 100644 (file)
@@ -213,7 +213,7 @@ static struct rc_keymap dib0700_rc5_map = {
        .map = {
                .scan    = dib0700_rc5_table,
                .size    = ARRAY_SIZE(dib0700_rc5_table),
-               .ir_type = IR_TYPE_RC5,
+               .rc_type = RC_TYPE_RC5,
                .name    = RC_MAP_DIB0700_RC5_TABLE,
        }
 };
index 63e469e2dd213a39206613ee1dc3a5ebcbdd8529..8ae726b568ed910a3d336bacedd6f3a41a6f1aa2 100644 (file)
@@ -76,7 +76,7 @@ static struct rc_keymap digitalnow_tinytwin_map = {
        .map = {
                .scan    = digitalnow_tinytwin,
                .size    = ARRAY_SIZE(digitalnow_tinytwin),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_DIGITALNOW_TINYTWIN,
        }
 };
index 5dece78e19c5f2b302b2ed8c2008c23b7d8e369f..206469fb028ef99d044bce935451fb37a6ea052c 100644 (file)
@@ -60,7 +60,7 @@ static struct rc_keymap digittrade_map = {
        .map = {
                .scan    = digittrade,
                .size    = ARRAY_SIZE(digittrade),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_DIGITTRADE,
        }
 };
index 90684d0efea345235f043dc5ea2427d821b55e33..ba6fb0be9d3c7ac3427588c5009a0ab2c17d9025 100644 (file)
@@ -54,7 +54,7 @@ static struct rc_keymap dm1105_nec_map = {
        .map = {
                .scan    = dm1105_nec,
                .size    = ARRAY_SIZE(dm1105_nec),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_DM1105_NEC,
        }
 };
index 8a4027af964a23766402d2501723509c388c0ac9..b703937f160bbd0e6b7354bcea428ca6136088ae 100644 (file)
@@ -56,7 +56,7 @@ static struct rc_keymap dntv_live_dvb_t_map = {
        .map = {
                .scan    = dntv_live_dvb_t,
                .size    = ARRAY_SIZE(dntv_live_dvb_t),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_DNTV_LIVE_DVB_T,
        }
 };
index 6f4d60764d596a121510c4061bc7f201176d241e..b0126b2fceaba5959b831f29aec82750b5667930 100644 (file)
@@ -75,7 +75,7 @@ static struct rc_keymap dntv_live_dvbt_pro_map = {
        .map = {
                .scan    = dntv_live_dvbt_pro,
                .size    = ARRAY_SIZE(dntv_live_dvbt_pro),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_DNTV_LIVE_DVBT_PRO,
        }
 };
index 3130c9c29e6ba2cd0daca855356a4a5c4d70fde1..57bcd556821d1c3418b9fefc11d2cec8fc626e32 100644 (file)
@@ -47,7 +47,7 @@ static struct rc_keymap em_terratec_map = {
        .map = {
                .scan    = em_terratec,
                .size    = ARRAY_SIZE(em_terratec),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_EM_TERRATEC,
        }
 };
index 4b816967877e1dbf5bcd6f46d3cb714a349151fc..97e01f4cb76ab22cc19ec90a097c3d3d22b4a3bb 100644 (file)
@@ -59,7 +59,7 @@ static struct rc_keymap encore_enltv_fm53_map = {
        .map = {
                .scan    = encore_enltv_fm53,
                .size    = ARRAY_SIZE(encore_enltv_fm53),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_ENCORE_ENLTV_FM53,
        }
 };
index 9fabffd28cc958270d56aba6a3c2b9732443995a..d3030cf748394676b793b29333acbf77b80bc00e 100644 (file)
@@ -90,7 +90,7 @@ static struct rc_keymap encore_enltv_map = {
        .map = {
                .scan    = encore_enltv,
                .size    = ARRAY_SIZE(encore_enltv),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_ENCORE_ENLTV,
        }
 };
index efefd5166618043d55c49572749e90e00fbb9ee5..1871b32efa989f5cb56bd4bb59bb1a6dd60745b3 100644 (file)
@@ -68,7 +68,7 @@ static struct rc_keymap encore_enltv2_map = {
        .map = {
                .scan    = encore_enltv2,
                .size    = ARRAY_SIZE(encore_enltv2),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_ENCORE_ENLTV2,
        }
 };
index 3f3fb13813b38828b9a298316d5e6be64ce32329..192d7f8287f4250b900f771b7ff82d858511e325 100644 (file)
@@ -39,7 +39,7 @@ static struct rc_keymap evga_indtube_map = {
        .map = {
                .scan    = evga_indtube,
                .size    = ARRAY_SIZE(evga_indtube),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_EVGA_INDTUBE,
        }
 };
index 660907a78db9432d2e484ba36290bf6d665025eb..fe3ab5e31a7f5aa292211a82b221f77da49133dc 100644 (file)
@@ -74,7 +74,7 @@ static struct rc_keymap eztv_map = {
        .map = {
                .scan    = eztv,
                .size    = ARRAY_SIZE(eztv),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_EZTV,
        }
 };
index a173c81035f4dc2ec58d909fa82f3304b77896ab..f48249e070f54ff32525bd2a8ced0f1b7d816c2c 100644 (file)
@@ -55,7 +55,7 @@ static struct rc_keymap flydvb_map = {
        .map = {
                .scan    = flydvb,
                .size    = ARRAY_SIZE(flydvb),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_FLYDVB,
        }
 };
index 9c73043cbdbaf02a0578ef3d19cd527ed37a1c06..59713fb4682028f3a705aff8e53075e45dffdc83 100644 (file)
@@ -48,7 +48,7 @@ static struct rc_keymap flyvideo_map = {
        .map = {
                .scan    = flyvideo,
                .size    = ARRAY_SIZE(flyvideo),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_FLYVIDEO,
        }
 };
index cdb10389b10ef5cbfe42c434dc6bc7896d52e5f6..e69458d8eb1b5466fc6b10541b31887dc0f9df29 100644 (file)
@@ -76,7 +76,7 @@ static struct rc_keymap fusionhdtv_mce_map = {
        .map = {
                .scan    = fusionhdtv_mce,
                .size    = ARRAY_SIZE(fusionhdtv_mce),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_FUSIONHDTV_MCE,
        }
 };
index c16c0d1263acf33a083b04e636a3de031d5e383f..13587b8d6a4a39893e915ea21285cb031cf367ee 100644 (file)
@@ -59,7 +59,7 @@ static struct rc_keymap gadmei_rm008z_map = {
        .map = {
                .scan    = gadmei_rm008z,
                .size    = ARRAY_SIZE(gadmei_rm008z),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_GADMEI_RM008Z,
        }
 };
index 89f8e384e52a6b8d9992608c537f49ed084b656b..2304bf677b3d5397e20781a6b8aa88090e3ead0d 100644 (file)
@@ -62,7 +62,7 @@ static struct rc_keymap genius_tvgo_a11mce_map = {
        .map = {
                .scan    = genius_tvgo_a11mce,
                .size    = ARRAY_SIZE(genius_tvgo_a11mce),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_GENIUS_TVGO_A11MCE,
        }
 };
index 52f025bb35f6c6a0d94c0f06c90ca8a05306fc07..b5be7bfbb7f0b8ec6fd5bc649526edfdbc3da9ce 100644 (file)
@@ -57,7 +57,7 @@ static struct rc_keymap gotview7135_map = {
        .map = {
                .scan    = gotview7135,
                .size    = ARRAY_SIZE(gotview7135),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_GOTVIEW7135,
        }
 };
index c6f8cd7c5186ab1f1300cc650ba8f11b893a5114..c60f845dd930639140cfe202d8187e5529044deb 100644 (file)
@@ -78,7 +78,7 @@ static struct rc_keymap hauppauge_new_map = {
        .map = {
                .scan    = hauppauge_new,
                .size    = ARRAY_SIZE(hauppauge_new),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_HAUPPAUGE_NEW,
        }
 };
index e49f350e3a0d97154cc5b1e43e14e6588cceff42..4ce902f87701afe949663ba94a1143bbf8cee84a 100644 (file)
@@ -120,7 +120,7 @@ static struct rc_keymap imon_mce_map = {
                .scan    = imon_mce,
                .size    = ARRAY_SIZE(imon_mce),
                /* its RC6, but w/a hardware decoder */
-               .ir_type = IR_TYPE_RC6,
+               .rc_type = RC_TYPE_RC6,
                .name    = RC_MAP_IMON_MCE,
        }
 };
index bc4db72f02e6a0083bb4a285768f4e665111d7f5..6d4633af439354e7e04882fc863fd24e58f8bd6b 100644 (file)
@@ -134,7 +134,7 @@ static struct rc_keymap imon_pad_map = {
                .scan    = imon_pad,
                .size    = ARRAY_SIZE(imon_pad),
                /* actual protocol details unknown, hardware decoder */
-               .ir_type = IR_TYPE_OTHER,
+               .rc_type = RC_TYPE_OTHER,
                .name    = RC_MAP_IMON_PAD,
        }
 };
index ef6600259fc02dbea6d20f08e71063a37b602188..c5208f10e7c0df75fdc4e306675007a4d929e0a5 100644 (file)
@@ -66,7 +66,7 @@ static struct rc_keymap iodata_bctv7e_map = {
        .map = {
                .scan    = iodata_bctv7e,
                .size    = ARRAY_SIZE(iodata_bctv7e),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_IODATA_BCTV7E,
        }
 };
index 4c7883ba0f15ef11e2ef91c3589d8dc6a70a61fd..1b6da7ffb8f105cd6dd97d556815d93e7dc31ed7 100644 (file)
@@ -65,7 +65,7 @@ static struct rc_keymap kaiomy_map = {
        .map = {
                .scan    = kaiomy,
                .size    = ARRAY_SIZE(kaiomy),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_KAIOMY,
        }
 };
index 618c817374e66c196e381c06a43b71d47b12c51b..3418e075938cd92a703bf96610ae904baa7565fc 100644 (file)
@@ -61,7 +61,7 @@ static struct rc_keymap kworld_315u_map = {
        .map = {
                .scan    = kworld_315u,
                .size    = ARRAY_SIZE(kworld_315u),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_KWORLD_315U,
        }
 };
index 366732f1f7b70b3a78f406586b2b6c165a8b5c78..4d681eb7aaf459bfe830b81fa98f4d8214da583a 100644 (file)
@@ -77,7 +77,7 @@ static struct rc_keymap kworld_plus_tv_analog_map = {
        .map = {
                .scan    = kworld_plus_tv_analog,
                .size    = ARRAY_SIZE(kworld_plus_tv_analog),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_KWORLD_PLUS_TV_ANALOG,
        }
 };
index 7521315fd876eba0695f0df155cbbc8b1fb37d49..ebdd1226badac15ee8a9ee5be227bc6245dc5059 100644 (file)
@@ -77,7 +77,7 @@ static struct rc_keymap leadtek_y04g0051_map = {
        .map = {
                .scan    = leadtek_y04g0051,
                .size    = ARRAY_SIZE(leadtek_y04g0051),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_LEADTEK_Y04G0051,
        }
 };
index 9c8577d6e49707d639e4c1f75f81ffcaa3d2b3c2..6d8a64170fd9c7e7dc24a81e423349df67761b1e 100644 (file)
@@ -19,7 +19,7 @@ static struct rc_keymap lirc_map = {
        .map = {
                .scan    = lirc,
                .size    = ARRAY_SIZE(lirc),
-               .ir_type = IR_TYPE_LIRC,
+               .rc_type = RC_TYPE_LIRC,
                .name    = RC_MAP_LIRC,
        }
 };
index 40dcf0b4e21a0d760e1e9e36ce57d131cdef113b..ca7e2acb682a6ac4ea147e50ae2b576532776f68 100644 (file)
@@ -46,7 +46,7 @@ static struct rc_keymap lme2510_map = {
        .map = {
                .scan    = lme2510_rc,
                .size    = ARRAY_SIZE(lme2510_rc),
-               .ir_type = IR_TYPE_UNKNOWN,
+               .rc_type = RC_TYPE_UNKNOWN,
                .name    = RC_MAP_LME2510,
        }
 };
index 0f590b3d01c0b23091dc3b4c6c8c6155ceaa526e..056cf52dce60b9c31ceb82567ca73a4fbc616f95 100644 (file)
@@ -112,7 +112,7 @@ static struct rc_keymap manli_map = {
        .map = {
                .scan    = manli,
                .size    = ARRAY_SIZE(manli),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_MANLI,
        }
 };
index 67237fbf9e4bb1a269a943fdb13f53aa3b886946..3a14d31bec4de4733cd34f20c8f0442f52ccfe30 100644 (file)
@@ -45,7 +45,7 @@ static struct rc_keymap msi_digivox_ii_map = {
        .map = {
                .scan    = msi_digivox_ii,
                .size    = ARRAY_SIZE(msi_digivox_ii),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_MSI_DIGIVOX_II,
        }
 };
index 882056e52ef963468ce9e8c943afb0ade9e97ad9..16c5b0aa8c43e0af97c3a6a3a2eb759e3508be7d 100644 (file)
@@ -63,7 +63,7 @@ static struct rc_keymap msi_digivox_iii_map = {
        .map = {
                .scan    = msi_digivox_iii,
                .size    = ARRAY_SIZE(msi_digivox_iii),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_MSI_DIGIVOX_III,
        }
 };
index eb8e42c18ff930c08d671618c8b18c05fd260d4c..d4c91020fc07cffdd523128e0c536aea39845dbd 100644 (file)
@@ -101,7 +101,7 @@ static struct rc_keymap msi_tvanywhere_plus_map = {
        .map = {
                .scan    = msi_tvanywhere_plus,
                .size    = ARRAY_SIZE(msi_tvanywhere_plus),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_MSI_TVANYWHERE_PLUS,
        }
 };
index ef411854f06732e0b1dc26dc63d6620c918bcd93..aec064cb7b157d4822d2e8d775a81c6eb957d83f 100644 (file)
@@ -47,7 +47,7 @@ static struct rc_keymap msi_tvanywhere_map = {
        .map = {
                .scan    = msi_tvanywhere,
                .size    = ARRAY_SIZE(msi_tvanywhere),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_MSI_TVANYWHERE,
        }
 };
index ccc50eb402ec3c5bd3a93beb018b17d968b3b6f7..2c44b90d48c90254c6d78361c973cae2f40b4de0 100644 (file)
@@ -74,7 +74,7 @@ static struct rc_keymap nebula_map = {
        .map = {
                .scan    = nebula,
                .size    = ARRAY_SIZE(nebula),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_NEBULA,
        }
 };
index e1b54d20db600fe7d0cb47ce24f42e887f2fc8b4..929084bcaa4d24ef58edf680d3db89760a1b3986 100644 (file)
@@ -83,7 +83,7 @@ static struct rc_keymap nec_terratec_cinergy_xs_map = {
        .map = {
                .scan    = nec_terratec_cinergy_xs,
                .size    = ARRAY_SIZE(nec_terratec_cinergy_xs),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_NEC_TERRATEC_CINERGY_XS,
        }
 };
index e5849a6b3f0594fb8a65b1b27b372a450fe27360..7fe774628edc349ddde7efb25c4a390f84a5e960 100644 (file)
@@ -63,7 +63,7 @@ static struct rc_keymap norwood_map = {
        .map = {
                .scan    = norwood,
                .size    = ARRAY_SIZE(norwood),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_NORWOOD,
        }
 };
index b9ece1e9029664c9eab2896f7ba6a3b8ec588e07..a9cbcde98a30eee48820cecdf79291c698b63816 100644 (file)
@@ -58,7 +58,7 @@ static struct rc_keymap npgtech_map = {
        .map = {
                .scan    = npgtech,
                .size    = ARRAY_SIZE(npgtech),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_NPGTECH,
        }
 };
index 4129bb44a25b0b87320364e19ff18c60d6d54a97..68b33b31f6bf08c70b6b748017e404ce69ce351f 100644 (file)
@@ -58,7 +58,7 @@ static struct rc_keymap pctv_sedna_map = {
        .map = {
                .scan    = pctv_sedna,
                .size    = ARRAY_SIZE(pctv_sedna),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PCTV_SEDNA,
        }
 };
index 326e023ce1267c255be1864a9e82749b95cdc2b4..364ccde87a04e4d2eb3463d1e24545be1d5ad8f7 100644 (file)
@@ -72,7 +72,7 @@ static struct rc_keymap pinnacle_color_map = {
        .map = {
                .scan    = pinnacle_color,
                .size    = ARRAY_SIZE(pinnacle_color),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PINNACLE_COLOR,
        }
 };
index 14cb772515c6ac5e9df8ccf5712f69cdd6d73d39..993eff72f233c9c1e74182612bdc56d9d1488ba1 100644 (file)
@@ -67,7 +67,7 @@ static struct rc_keymap pinnacle_grey_map = {
        .map = {
                .scan    = pinnacle_grey,
                .size    = ARRAY_SIZE(pinnacle_grey),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PINNACLE_GREY,
        }
 };
index 835bf4ef8de7d1a2e5607be998626a24566727df..56e6a7e203eccce5e3ba8196939c4670bb734c25 100644 (file)
@@ -51,7 +51,7 @@ static struct rc_keymap pinnacle_pctv_hd_map = {
        .map = {
                .scan    = pinnacle_pctv_hd,
                .size    = ARRAY_SIZE(pinnacle_pctv_hd),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PINNACLE_PCTV_HD,
        }
 };
index 5a735d569a8b4e9a311de4b19795b24de1266ae9..84f89ebd89980d4e47c2bda1d5d0e73a7047043f 100644 (file)
@@ -61,7 +61,7 @@ static struct rc_keymap pixelview_map = {
        .map = {
                .scan    = pixelview_mk12,
                .size    = ARRAY_SIZE(pixelview_mk12),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_PIXELVIEW_MK12,
        }
 };
index 7bbbbf5735e6f36f559f9b8fb59778c7815ec9e5..703f86bca132f5bb55116bd38cba39df48b0d295 100644 (file)
@@ -61,7 +61,7 @@ static struct rc_keymap pixelview_new_map = {
        .map = {
                .scan    = pixelview_new,
                .size    = ARRAY_SIZE(pixelview_new),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PIXELVIEW_NEW,
        }
 };
index 82ff12e182a05ebe02698e58c26d1191a9699d98..5a50aa7e411d5962abeb41c7c39d3d25d31fea4b 100644 (file)
@@ -60,7 +60,7 @@ static struct rc_keymap pixelview_map = {
        .map = {
                .scan    = pixelview,
                .size    = ARRAY_SIZE(pixelview),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PIXELVIEW,
        }
 };
index 7cef8190a224c9d43db13ed65f19700d5d03c456..4eec4371f7d175ad867da19340245d87c270bf91 100644 (file)
@@ -59,7 +59,7 @@ static struct rc_keymap powercolor_real_angel_map = {
        .map = {
                .scan    = powercolor_real_angel,
                .size    = ARRAY_SIZE(powercolor_real_angel),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_POWERCOLOR_REAL_ANGEL,
        }
 };
index 22e92d39dee55116a0303d102d9746bf92439db8..802c58a0ae26f5553539ce87e97e9fdc0a6698f0 100644 (file)
@@ -47,7 +47,7 @@ static struct rc_keymap proteus_2309_map = {
        .map = {
                .scan    = proteus_2309,
                .size    = ARRAY_SIZE(proteus_2309),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PROTEUS_2309,
        }
 };
index 4e20fc2269f76fb3de19e38f1b802e0267532a68..f3e9709b7c1fe861a403e723dea0b0dd28c12e24 100644 (file)
@@ -59,7 +59,7 @@ static struct rc_keymap purpletv_map = {
        .map = {
                .scan    = purpletv,
                .size    = ARRAY_SIZE(purpletv),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PURPLETV,
        }
 };
index 36679e706cf308077c699ba1bb48caad1e60668c..e301ff033af1626ec798c4ce2a9704f20a0999a0 100644 (file)
@@ -56,7 +56,7 @@ static struct rc_keymap pv951_map = {
        .map = {
                .scan    = pv951,
                .size    = ARRAY_SIZE(pv951),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_PV951,
        }
 };
index cc6b8f5487473cb17d3cec4550e96a99af4e89a7..91bcab8bd266a5247f537f5f72ce2a2bb967304e 100644 (file)
@@ -81,7 +81,7 @@ static struct rc_keymap rc5_hauppauge_new_map = {
        .map = {
                .scan    = rc5_hauppauge_new,
                .size    = ARRAY_SIZE(rc5_hauppauge_new),
-               .ir_type = IR_TYPE_RC5,
+               .rc_type = RC_TYPE_RC5,
                .name    = RC_MAP_RC5_HAUPPAUGE_NEW,
        }
 };
index 73cce2f8ddfba1efd8ec72b51d342f712c01c98f..cda2a2fae04da45250ca7313fd9c50a8285afe2f 100644 (file)
@@ -59,7 +59,7 @@ static struct rc_keymap rc5_tv_map = {
        .map = {
                .scan    = rc5_tv,
                .size    = ARRAY_SIZE(rc5_tv),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_RC5_TV,
        }
 };
index 6da955dfef48989a1773792f09bf1715326a86b5..f926477a05622735be1f43c4247af9038e9abe84 100644 (file)
@@ -91,7 +91,7 @@ static struct rc_keymap rc6_mce_map = {
        .map = {
                .scan    = rc6_mce,
                .size    = ARRAY_SIZE(rc6_mce),
-               .ir_type = IR_TYPE_RC6,
+               .rc_type = RC_TYPE_RC6,
                .name    = RC_MAP_RC6_MCE,
        }
 };
index ab1a6d2baf726c3aab8484a3b4cb21e8ab19bf2c..67814265918304b496937f037b8c70ce1b24e8f1 100644 (file)
@@ -56,7 +56,7 @@ static struct rc_keymap real_audio_220_32_keys_map = {
        .map = {
                .scan    = real_audio_220_32_keys,
                .size    = ARRAY_SIZE(real_audio_220_32_keys),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_REAL_AUDIO_220_32_KEYS,
        }
 };
index df32013a321c7135e0c270f8e123bd4d9e6a9c68..bafe5b8f41920f16b22c4eff27ebfae1227cea98 100644 (file)
@@ -60,7 +60,7 @@ static struct rc_keymap streamzap_map = {
        .map = {
                .scan    = streamzap,
                .size    = ARRAY_SIZE(streamzap),
-               .ir_type = IR_TYPE_RC5_SZ,
+               .rc_type = RC_TYPE_RC5_SZ,
                .name    = RC_MAP_STREAMZAP,
        }
 };
index 3309631e6f80a7faec83b3021e12fca489706c72..4ef4f811d0111fc0accadd9cd84ea37cdc268ea7 100644 (file)
@@ -51,7 +51,7 @@ static struct rc_keymap tbs_nec_map = {
        .map = {
                .scan    = tbs_nec,
                .size    = ARRAY_SIZE(tbs_nec),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_TBS_NEC,
        }
 };
index 5326a0b444c104b0d685f30e70c23d7625351ef4..4064a32569e213cdf905b729282cdc9b7814ed77 100644 (file)
@@ -70,7 +70,7 @@ static struct rc_keymap terratec_cinergy_xs_map = {
        .map = {
                .scan    = terratec_cinergy_xs,
                .size    = ARRAY_SIZE(terratec_cinergy_xs),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_TERRATEC_CINERGY_XS,
        }
 };
index 10dee4c1deff8351912b3975d118e80eb088f694..c23caf70036b3a22af636c0553e96d8b23fcadcb 100644 (file)
@@ -57,7 +57,7 @@ static struct rc_keymap terratec_slim_map = {
        .map = {
                .scan    = terratec_slim,
                .size    = ARRAY_SIZE(terratec_slim),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_TERRATEC_SLIM,
        }
 };
index e30d411c07bb2b94a63f3fb80029496d1a8709aa..eabfb70973b58ae912fdbca4629032475dd104dd 100644 (file)
@@ -66,7 +66,7 @@ static struct rc_keymap tevii_nec_map = {
        .map = {
                .scan    = tevii_nec,
                .size    = ARRAY_SIZE(tevii_nec),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_TEVII_NEC,
        }
 };
index fd198576378155448f0c6e9adf56f607f99761d3..cd39b3dbab0667ea568838c855d2334e1ac2de72 100644 (file)
@@ -63,7 +63,7 @@ static struct rc_keymap total_media_in_hand_map = {
        .map = {
                .scan    = total_media_in_hand,
                .size    = ARRAY_SIZE(total_media_in_hand),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_TOTAL_MEDIA_IN_HAND,
        }
 };
index 91092caca452311fdbc6be3693daa9ca7ecb9ecc..31d6c6c2364267d950d0e97e885e858fb5fafe30 100644 (file)
@@ -58,7 +58,7 @@ static struct rc_keymap trekstor_map = {
        .map = {
                .scan    = trekstor,
                .size    = ARRAY_SIZE(trekstor),
-               .ir_type = IR_TYPE_NEC,
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_TREKSTOR,
        }
 };
index bc88de011d5dd110fe5b7cf2b056d522bba6c76c..45a060850e5367b305fabbc7481671ba4c3be584 100644 (file)
@@ -60,7 +60,7 @@ static struct rc_keymap tt_1500_map = {
        .map = {
                .scan    = tt_1500,
                .size    = ARRAY_SIZE(tt_1500),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_TT_1500,
        }
 };
index 0b5d356c2d84281703cf1f8f953de9fc24e3167f..b5def5387ded19e31755175a4c6b0ba386904106 100644 (file)
@@ -65,7 +65,7 @@ static struct rc_keymap twinhan_vp1027_map = {
        .map = {
                .scan    = twinhan_vp1027,
                .size    = ARRAY_SIZE(twinhan_vp1027),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_TWINHAN_VP1027_DVBS,
        }
 };
index 4df7fcd1d2fcb8616f92553db543dade2f5405b2..7c422b4670fa7689874255cffaf6313e5cad25d0 100644 (file)
@@ -63,7 +63,7 @@ static struct rc_keymap videomate_s350_map = {
        .map = {
                .scan    = videomate_s350,
                .size    = ARRAY_SIZE(videomate_s350),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_VIDEOMATE_S350,
        }
 };
index 776b0a638d8701933469f7cfc006d5691c0b5383..4d31b47dfc307848415a0eee1a48442a5a885a2e 100644 (file)
@@ -65,7 +65,7 @@ static struct rc_keymap videomate_tv_pvr_map = {
        .map = {
                .scan    = videomate_tv_pvr,
                .size    = ARRAY_SIZE(videomate_tv_pvr),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_VIDEOMATE_TV_PVR,
        }
 };
index 9d2d550aaa90d493fd1cf161ba857f880320fdc0..ade3c14c4c0f7149af1543893d0e61a64f96eb42 100644 (file)
@@ -60,7 +60,7 @@ static struct rc_keymap winfast_usbii_deluxe_map = {
        .map = {
                .scan    = winfast_usbii_deluxe,
                .size    = ARRAY_SIZE(winfast_usbii_deluxe),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_WINFAST_USBII_DELUXE,
        }
 };
index 0e90a3bd9499bf57f67c81192773e4ab43091e40..502b5f54f84ebf6f620eae89c2a2c9c002a9a2b3 100644 (file)
@@ -80,7 +80,7 @@ static struct rc_keymap winfast_map = {
        .map = {
                .scan    = winfast,
                .size    = ARRAY_SIZE(winfast),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_WINFAST,
        }
 };
index db7787ac67a365193803e673288ed17ec2d54eb2..c2cb58a0c6edf9393f7c6cf336288d796f4826fa 100644 (file)
@@ -1060,7 +1060,7 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
        rc->dev.parent = dev;
        rc->priv = ir;
        rc->driver_type = RC_DRIVER_IR_RAW;
-       rc->allowed_protos = IR_TYPE_ALL;
+       rc->allowed_protos = RC_TYPE_ALL;
        rc->timeout = MS_TO_NS(1000);
        if (!ir->flags.no_tx) {
                rc->s_tx_mask = mceusb_set_tx_mask;
index bf3f58f7bd7c946322d411302e68fd63a062760f..7fca6d1549ed6e4d6d1156b2a0aacaa9651affd7 100644 (file)
@@ -1060,7 +1060,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
        /* Set up the rc device */
        rdev->priv = nvt;
        rdev->driver_type = RC_DRIVER_IR_RAW;
-       rdev->allowed_protos = IR_TYPE_ALL;
+       rdev->allowed_protos = RC_TYPE_ALL;
        rdev->open = nvt_open;
        rdev->close = nvt_close;
        rdev->tx_ir = nvt_tx_ir;
index 11e2703ef1c44cfed4de79d0acbd6f4ca6e1f457..f3244eba66c631dceb808d2f1f6028f9363d8e49 100644 (file)
@@ -102,7 +102,7 @@ static struct rc_keymap empty_map = {
        .map = {
                .scan    = empty,
                .size    = ARRAY_SIZE(empty),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_UNKNOWN,     /* Legacy IR type */
                .name    = RC_MAP_EMPTY,
        }
 };
@@ -111,7 +111,7 @@ static struct rc_keymap empty_map = {
  * ir_create_table() - initializes a scancode table
  * @rc_tab:    the ir_scancode_table to initialize
  * @name:      name to assign to the table
- * @ir_type:   ir type to assign to the new table
+ * @rc_type:   ir type to assign to the new table
  * @size:      initial size of the table
  * @return:    zero on success or a negative error code
  *
@@ -119,10 +119,10 @@ static struct rc_keymap empty_map = {
  * memory to hold at least the specified number of elements.
  */
 static int ir_create_table(struct ir_scancode_table *rc_tab,
-                          const char *name, u64 ir_type, size_t size)
+                          const char *name, u64 rc_type, size_t size)
 {
        rc_tab->name = name;
-       rc_tab->ir_type = ir_type;
+       rc_tab->rc_type = rc_type;
        rc_tab->alloc = roundup_pow_of_two(size * sizeof(struct ir_scancode));
        rc_tab->size = rc_tab->alloc / sizeof(struct ir_scancode);
        rc_tab->scan = kmalloc(rc_tab->alloc, GFP_KERNEL);
@@ -372,7 +372,7 @@ static int ir_setkeytable(struct rc_dev *dev,
        int rc;
 
        rc = ir_create_table(rc_tab, from->name,
-                            from->ir_type, from->size);
+                            from->rc_type, from->size);
        if (rc)
                return rc;
 
@@ -719,14 +719,14 @@ static struct {
        u64     type;
        char    *name;
 } proto_names[] = {
-       { IR_TYPE_UNKNOWN,      "unknown"       },
-       { IR_TYPE_RC5,          "rc-5"          },
-       { IR_TYPE_NEC,          "nec"           },
-       { IR_TYPE_RC6,          "rc-6"          },
-       { IR_TYPE_JVC,          "jvc"           },
-       { IR_TYPE_SONY,         "sony"          },
-       { IR_TYPE_RC5_SZ,       "rc-5-sz"       },
-       { IR_TYPE_LIRC,         "lirc"          },
+       { RC_TYPE_UNKNOWN,      "unknown"       },
+       { RC_TYPE_RC5,          "rc-5"          },
+       { RC_TYPE_NEC,          "nec"           },
+       { RC_TYPE_RC6,          "rc-6"          },
+       { RC_TYPE_JVC,          "jvc"           },
+       { RC_TYPE_SONY,         "sony"          },
+       { RC_TYPE_RC5_SZ,       "rc-5-sz"       },
+       { RC_TYPE_LIRC,         "lirc"          },
 };
 
 #define PROTO_NONE     "none"
@@ -755,7 +755,7 @@ static ssize_t show_protocols(struct device *device,
                return -EINVAL;
 
        if (dev->driver_type == RC_DRIVER_SCANCODE) {
-               enabled = dev->rc_tab.ir_type;
+               enabled = dev->rc_tab.rc_type;
                allowed = dev->allowed_protos;
        } else {
                enabled = dev->raw->enabled_protocols;
@@ -813,7 +813,7 @@ static ssize_t store_protocols(struct device *device,
                return -EINVAL;
 
        if (dev->driver_type == RC_DRIVER_SCANCODE)
-               type = dev->rc_tab.ir_type;
+               type = dev->rc_tab.rc_type;
        else if (dev->raw)
                type = dev->raw->enabled_protocols;
        else {
@@ -881,7 +881,7 @@ static ssize_t store_protocols(struct device *device,
 
        if (dev->driver_type == RC_DRIVER_SCANCODE) {
                spin_lock_irqsave(&dev->rc_tab.lock, flags);
-               dev->rc_tab.ir_type = type;
+               dev->rc_tab.rc_type = type;
                spin_unlock_irqrestore(&dev->rc_tab.lock, flags);
        } else {
                dev->raw->enabled_protocols = type;
@@ -1052,7 +1052,7 @@ int rc_register_device(struct rc_dev *dev)
        }
 
        if (dev->change_protocol) {
-               rc = dev->change_protocol(dev, rc_tab->ir_type);
+               rc = dev->change_protocol(dev, rc_tab->rc_type);
                if (rc < 0)
                        goto out_raw;
        }
index ea2cb636a193b6e8b6201577e9767dc9466755d1..7814ec709bfc1656f3a51918562019819d489827 100644 (file)
@@ -318,7 +318,7 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz)
        rdev->input_phys = sz->phys;
        rdev->priv = sz;
        rdev->driver_type = RC_DRIVER_IR_RAW;
-       rdev->allowed_protos = IR_TYPE_ALL;
+       rdev->allowed_protos = RC_TYPE_ALL;
        rdev->driver_name = DRIVER_NAME;
        rdev->map_name = RC_MAP_STREAMZAP;
 
index e71a026f3419140a314217b923c428d25e9b9f73..c330fb917b50bfd0ea1f3f22fb3d378d9fe3f2b0 100644 (file)
@@ -98,7 +98,7 @@ static int cx18_i2c_new_ir(struct cx18 *cx, struct i2c_adapter *adap, u32 hw,
        case CX18_HW_Z8F0811_IR_RX_HAUP:
                init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;
                init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
-               init_data->type = IR_TYPE_RC5;
+               init_data->type = RC_TYPE_RC5;
                init_data->name = cx->card_name;
                info.platform_data = init_data;
                break;
index 1d043ed1bc32ef1c9e274df7b2bd02cc139ec173..c236a4e7e97ba623feb35d688722b6953be90053 100644 (file)
@@ -84,7 +84,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
        /* The i2c micro-controller only outputs the cmd part of NEC protocol */
        dev->init_data.rc_dev->scanmask = 0xff;
        dev->init_data.rc_dev->driver_name = "cx231xx";
-       dev->init_data.type = IR_TYPE_NEC;
+       dev->init_data.type = RC_TYPE_NEC;
        info.addr = 0x30;
 
        /* Load and bind ir-kbd-i2c */
index e824ba63fdde0465103fc7d8f7a2d13dde8df650..0b0d0664382ae07c6c3a2504decaab3808ea215a 100644 (file)
@@ -264,14 +264,14 @@ int cx23885_input_init(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1250:
                /* Integrated CX2388[58] IR controller */
                driver_type = RC_DRIVER_IR_RAW;
-               allowed_protos = IR_TYPE_ALL;
+               allowed_protos = RC_TYPE_ALL;
                /* The grey Hauppauge RC-5 remote */
                rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;
                break;
        case CX23885_BOARD_TEVII_S470:
                /* Integrated CX23885 IR controller */
                driver_type = RC_DRIVER_IR_RAW;
-               allowed_protos = IR_TYPE_ALL;
+               allowed_protos = RC_TYPE_ALL;
                /* A guess at the remote */
                rc_map = RC_MAP_TEVII_NEC;
                break;
index cfeba4c087155f19df55f6c515dd4c387546975c..4a3bf5476c71f8a68a7764f856ccbdb66cb12352 100644 (file)
@@ -241,7 +241,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        struct cx88_IR *ir;
        struct rc_dev *dev;
        char *ir_codes = NULL;
-       u64 ir_type = IR_TYPE_OTHER;
+       u64 rc_type = RC_TYPE_OTHER;
        int err = -ENOMEM;
        u32 hardware_mask = 0;  /* For devices with a hardware mask, when
                                 * used with a full-code IR table
@@ -404,7 +404,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                break;
        case CX88_BOARD_TWINHAN_VP1027_DVBS:
                ir_codes         = RC_MAP_TWINHAN_VP1027_DVBS;
-               ir_type          = IR_TYPE_NEC;
+               rc_type          = RC_TYPE_NEC;
                ir->sampling     = 0xff00; /* address */
                break;
        }
@@ -457,7 +457,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                dev->timeout = 10 * 1000 * 1000; /* 10 ms */
        } else {
                dev->driver_type = RC_DRIVER_SCANCODE;
-               dev->allowed_protos = ir_type;
+               dev->allowed_protos = rc_type;
        }
 
        ir->core = core;
@@ -557,7 +557,7 @@ void cx88_i2c_init_ir(struct cx88_core *core)
                        /* Hauppauge XVR */
                        core->init_data.name = "cx88 Hauppauge XVR remote";
                        core->init_data.ir_codes = RC_MAP_HAUPPAUGE_NEW;
-                       core->init_data.type = IR_TYPE_RC5;
+                       core->init_data.type = RC_TYPE_RC5;
                        core->init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
 
                        info.platform_data = &core->init_data;
index e32eb38564e671f6d88fd8dbb202ea481af327b2..29cc74441a7d3d63686dbfa5cd8c046f00023f9c 100644 (file)
@@ -343,7 +343,7 @@ static void em28xx_ir_stop(struct rc_dev *rc)
        cancel_delayed_work_sync(&ir->work);
 }
 
-int em28xx_ir_change_protocol(struct rc_dev *rc_dev, u64 ir_type)
+int em28xx_ir_change_protocol(struct rc_dev *rc_dev, u64 rc_type)
 {
        int rc = 0;
        struct em28xx_IR *ir = rc_dev->priv;
@@ -352,14 +352,14 @@ int em28xx_ir_change_protocol(struct rc_dev *rc_dev, u64 ir_type)
 
        /* Adjust xclk based o IR table for RC5/NEC tables */
 
-       if (ir_type == IR_TYPE_RC5) {
+       if (rc_type == RC_TYPE_RC5) {
                dev->board.xclk |= EM28XX_XCLK_IR_RC5_MODE;
                ir->full_code = 1;
-       } else if (ir_type == IR_TYPE_NEC) {
+       } else if (rc_type == RC_TYPE_NEC) {
                dev->board.xclk &= ~EM28XX_XCLK_IR_RC5_MODE;
                ir_config = EM2874_IR_NEC;
                ir->full_code = 1;
-       } else if (ir_type != IR_TYPE_UNKNOWN)
+       } else if (rc_type != RC_TYPE_UNKNOWN)
                rc = -EINVAL;
 
        em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk,
@@ -408,14 +408,14 @@ int em28xx_ir_init(struct em28xx *dev)
         * em2874 supports more protocols. For now, let's just announce
         * the two protocols that were already tested
         */
-       rc->allowed_protos = IR_TYPE_RC5 | IR_TYPE_NEC;
+       rc->allowed_protos = RC_TYPE_RC5 | RC_TYPE_NEC;
        rc->priv = ir;
        rc->change_protocol = em28xx_ir_change_protocol;
        rc->open = em28xx_ir_start;
        rc->close = em28xx_ir_stop;
 
        /* By default, keep protocol field untouched */
-       err = em28xx_ir_change_protocol(rc, IR_TYPE_UNKNOWN);
+       err = em28xx_ir_change_protocol(rc, RC_TYPE_UNKNOWN);
        if (err)
                goto err_out_free;
 
index c77ea53f50d7c8eb044019d025873dd08e6037df..dd54c3dae054d498162d1a5f2d137406d841fa08 100644 (file)
@@ -269,7 +269,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
        char *ir_codes = NULL;
        const char *name = NULL;
-       u64 ir_type = IR_TYPE_UNKNOWN;
+       u64 rc_type = RC_TYPE_UNKNOWN;
        struct IR_i2c *ir;
        struct rc_dev *rc = NULL;
        struct i2c_adapter *adap = client->adapter;
@@ -288,7 +288,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
        case 0x64:
                name        = "Pixelview";
                ir->get_key = get_key_pixelview;
-               ir_type     = IR_TYPE_OTHER;
+               rc_type     = RC_TYPE_OTHER;
                ir_codes    = RC_MAP_EMPTY;
                break;
        case 0x18:
@@ -296,7 +296,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
        case 0x1a:
                name        = "Hauppauge";
                ir->get_key = get_key_haup;
-               ir_type     = IR_TYPE_RC5;
+               rc_type     = RC_TYPE_RC5;
                if (hauppauge == 1) {
                        ir_codes    = RC_MAP_HAUPPAUGE_NEW;
                } else {
@@ -306,19 +306,19 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
        case 0x30:
                name        = "KNC One";
                ir->get_key = get_key_knc1;
-               ir_type     = IR_TYPE_OTHER;
+               rc_type     = RC_TYPE_OTHER;
                ir_codes    = RC_MAP_EMPTY;
                break;
        case 0x6b:
                name        = "FusionHDTV";
                ir->get_key = get_key_fusionhdtv;
-               ir_type     = IR_TYPE_RC5;
+               rc_type     = RC_TYPE_RC5;
                ir_codes    = RC_MAP_FUSIONHDTV_MCE;
                break;
        case 0x40:
                name        = "AVerMedia Cardbus remote";
                ir->get_key = get_key_avermedia_cardbus;
-               ir_type     = IR_TYPE_OTHER;
+               rc_type     = RC_TYPE_OTHER;
                ir_codes    = RC_MAP_AVERMEDIA_CARDBUS;
                break;
        }
@@ -333,7 +333,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
                name = init_data->name;
                if (init_data->type)
-                       ir_type = init_data->type;
+                       rc_type = init_data->type;
 
                if (init_data->polling_interval)
                        ir->polling_interval = init_data->polling_interval;
@@ -378,7 +378,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
        ir->rc = rc;
 
        /* Make sure we are all setup before going on */
-       if (!name || !ir->get_key || !ir_type || !ir_codes) {
+       if (!name || !ir->get_key || !rc_type || !ir_codes) {
                dprintk(1, ": Unsupported device at address 0x%02x\n",
                        addr);
                err = -ENODEV;
@@ -405,7 +405,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         * Initialize the other fields of rc_dev
         */
        rc->map_name       = ir->ir_codes;
-       rc->allowed_protos = ir_type;
+       rc->allowed_protos = rc_type;
        if (!rc->driver_name)
                rc->driver_name = MODULE_NAME;
 
index 665191c9b4079a2cae48f453c74832acb21d7b8d..68170924448c3894dfa0db524b975eddee0ee8c0 100644 (file)
@@ -172,7 +172,7 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
                init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS;
                init_data->internal_get_key_func =
                                        IR_KBD_GET_KEY_AVERMEDIA_CARDBUS;
-               init_data->type = IR_TYPE_OTHER;
+               init_data->type = RC_TYPE_OTHER;
                init_data->name = "AVerMedia AVerTV card";
                break;
        case IVTV_HW_I2C_IR_RX_HAUP_EXT:
@@ -180,14 +180,14 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
                /* Default to old black remote */
                init_data->ir_codes = RC_MAP_RC5_TV;
                init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP;
-               init_data->type = IR_TYPE_RC5;
+               init_data->type = RC_TYPE_RC5;
                init_data->name = itv->card_name;
                break;
        case IVTV_HW_Z8F0811_IR_RX_HAUP:
                /* Default to grey remote */
                init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;
                init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
-               init_data->type = IR_TYPE_RC5;
+               init_data->type = RC_TYPE_RC5;
                init_data->name = itv->card_name;
                break;
        }
index cd39aea30389e016684c6b0c7506bf8d86fcb0a1..f3f4aff2761eebb4bdd26a93df14ab7a93bd85ce 100644 (file)
@@ -909,7 +909,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
                dev->init_data.name = "BeholdTV";
                dev->init_data.get_key = get_key_beholdm6xx;
                dev->init_data.ir_codes = RC_MAP_BEHOLD;
-               dev->init_data.type = IR_TYPE_NEC;
+               dev->init_data.type = RC_TYPE_NEC;
                info.addr = 0x2d;
                break;
        case SAA7134_BOARD_AVERMEDIA_CARDBUS_501:
index 02b982978bb8e33bcffe25f249ed4be02cb00d27..e02ea6720380e306d7591874cc9237a873d2b661 100644 (file)
@@ -65,7 +65,7 @@ struct tm6000_IR {
        int (*get_key) (struct tm6000_IR *, struct tm6000_ir_poll_result *);
 
        /* IR device properties */
-       u64                     ir_type;
+       u64                     rc_type;
 };
 
 
@@ -143,7 +143,7 @@ static int default_polling_getkey(struct tm6000_IR *ir,
                return 0;
 
        if (&dev->int_in) {
-               if (ir->ir_type == IR_TYPE_RC5)
+               if (ir->rc_type == RC_TYPE_RC5)
                        poll_result->rc_data = ir->urb_data[0];
                else
                        poll_result->rc_data = ir->urb_data[0] | ir->urb_data[1] << 8;
@@ -153,7 +153,7 @@ static int default_polling_getkey(struct tm6000_IR *ir,
                tm6000_set_reg(dev, REQ_04_EN_DISABLE_MCU_INT, 2, 1);
                msleep(10);
 
-               if (ir->ir_type == IR_TYPE_RC5) {
+               if (ir->rc_type == RC_TYPE_RC5) {
                        rc = tm6000_read_write_usb(dev, USB_DIR_IN |
                                USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                                REQ_02_GET_IR_CODE, 0, 0, buf, 1);
@@ -230,7 +230,7 @@ static void tm6000_ir_stop(struct rc_dev *rc)
        cancel_delayed_work_sync(&ir->work);
 }
 
-int tm6000_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
+int tm6000_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
 {
        struct tm6000_IR *ir = rc->priv;
 
@@ -268,7 +268,7 @@ int tm6000_ir_init(struct tm6000_core *dev)
        ir->rc = rc;
 
        /* input einrichten */
-       rc->allowed_protos = IR_TYPE_RC5 | IR_TYPE_NEC;
+       rc->allowed_protos = RC_TYPE_RC5 | RC_TYPE_NEC;
        rc->priv = ir;
        rc->change_protocol = tm6000_ir_change_protocol;
        rc->open = tm6000_ir_start;
@@ -283,7 +283,7 @@ int tm6000_ir_init(struct tm6000_core *dev)
        usb_make_path(dev->udev, ir->phys, sizeof(ir->phys));
        strlcat(ir->phys, "/input0", sizeof(ir->phys));
 
-       tm6000_ir_change_protocol(rc, IR_TYPE_UNKNOWN);
+       tm6000_ir_change_protocol(rc, RC_TYPE_UNKNOWN);
 
        rc->input_name = ir->name;
        rc->input_phys = ir->phys;
index f22b359c37ff4fd9ea930653a209873b78478c9e..768aa77925cd952049cff78ae1c6ff8116369d90 100644 (file)
@@ -37,7 +37,7 @@ enum ir_kbd_get_key_fn {
 struct IR_i2c_init_data {
        char                    *ir_codes;
        const char              *name;
-       u64                     type; /* IR_TYPE_RC5, etc */
+       u64                     type; /* RC_TYPE_RC5, etc */
        u32                     polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */
 
        /*
index 170581b4fa84179d07c19ac9aa01effccb3fe9ac..42543257fa0f93419a9b87edb1a0652269e14388 100644 (file)
@@ -45,7 +45,7 @@ enum rc_driver_type {
  * @input_dev: the input child device used to communicate events to userspace
  * @driver_type: specifies if protocol decoding is done in hardware or software 
  * @idle: used to keep track of RX state
- * @allowed_protos: bitmask with the supported IR_TYPE_* protocols
+ * @allowed_protos: bitmask with the supported RC_TYPE_* protocols
  * @scanmask: some hardware decoders are not capable of providing the full
  *     scancode to the application. As this is a hardware limit, we can't do
  *     anything with it. Yet, as the same keycode table can be used with other
@@ -107,7 +107,7 @@ struct rc_dev {
        u32                             max_timeout;
        u32                             rx_resolution;
        u32                             tx_resolution;
-       int                             (*change_protocol)(struct rc_dev *dev, u64 ir_type);
+       int                             (*change_protocol)(struct rc_dev *dev, u64 rc_type);
        int                             (*open)(struct rc_dev *dev);
        void                            (*close)(struct rc_dev *dev);
        int                             (*s_tx_mask)(struct rc_dev *dev, u32 mask);
index e0f17edf38ed58a6d9bb1289b286ba220289b82a..c53351e15f505abcb4ce18db7c8cdf417a6768a3 100644 (file)
 
 #include <linux/input.h>
 
-#define IR_TYPE_UNKNOWN        0
-#define IR_TYPE_RC5    (1  << 0)       /* Philips RC5 protocol */
-#define IR_TYPE_NEC    (1  << 1)
-#define IR_TYPE_RC6    (1  << 2)       /* Philips RC6 protocol */
-#define IR_TYPE_JVC    (1  << 3)       /* JVC protocol */
-#define IR_TYPE_SONY   (1  << 4)       /* Sony12/15/20 protocol */
-#define IR_TYPE_RC5_SZ (1  << 5)       /* RC5 variant used by Streamzap */
-#define IR_TYPE_LIRC   (1  << 30)      /* Pass raw IR to lirc userspace */
-#define IR_TYPE_OTHER  (1u << 31)
+#define RC_TYPE_UNKNOWN        0
+#define RC_TYPE_RC5    (1  << 0)       /* Philips RC5 protocol */
+#define RC_TYPE_NEC    (1  << 1)
+#define RC_TYPE_RC6    (1  << 2)       /* Philips RC6 protocol */
+#define RC_TYPE_JVC    (1  << 3)       /* JVC protocol */
+#define RC_TYPE_SONY   (1  << 4)       /* Sony12/15/20 protocol */
+#define RC_TYPE_RC5_SZ (1  << 5)       /* RC5 variant used by Streamzap */
+#define RC_TYPE_LIRC   (1  << 30)      /* Pass raw IR to lirc userspace */
+#define RC_TYPE_OTHER  (1u << 31)
 
-#define IR_TYPE_ALL (IR_TYPE_RC5 | IR_TYPE_NEC  | IR_TYPE_RC6  | \
-                    IR_TYPE_JVC | IR_TYPE_SONY | IR_TYPE_LIRC | \
-                    IR_TYPE_RC5_SZ | IR_TYPE_OTHER)
+#define RC_TYPE_ALL (RC_TYPE_RC5 | RC_TYPE_NEC  | RC_TYPE_RC6  | \
+                    RC_TYPE_JVC | RC_TYPE_SONY | RC_TYPE_LIRC | \
+                    RC_TYPE_RC5_SZ | RC_TYPE_OTHER)
 
 struct ir_scancode {
        u32     scancode;
@@ -35,7 +35,7 @@ struct ir_scancode_table {
        unsigned int            size;   /* Max number of entries */
        unsigned int            len;    /* Used number of entries */
        unsigned int            alloc;  /* Size of *scan in bytes */
-       u64                     ir_type;
+       u64                     rc_type;
        const char              *name;
        spinlock_t              lock;
 };