diff mbox series

media: rc: add keymap for Beelink Mini MXIII remote

Message ID 20230128034117.3983105-1-christianshewitt@gmail.com
State New
Headers show
Series media: rc: add keymap for Beelink Mini MXIII remote | expand

Commit Message

Christian Hewitt Jan. 28, 2023, 3:41 a.m. UTC
Add a keymap and bindings for the simple IR (NEC) remote used with
the Beelink Mini MXIII Android STB device.

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 .../devicetree/bindings/media/rc.yaml         |  1 +
 drivers/media/rc/keymaps/Makefile             |  1 +
 drivers/media/rc/keymaps/rc-beelink-mxiii.c   | 54 +++++++++++++++++++
 include/media/rc-map.h                        |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c

Comments

Sean Young Jan. 29, 2023, 8:38 a.m. UTC | #1
On Sat, Jan 28, 2023 at 11:11:32AM +0100, Krzysztof Kozlowski wrote:
> On 28/01/2023 04:41, Christian Hewitt wrote:
> > Add a keymap and bindings for the simple IR (NEC) remote used with
> > the Beelink Mini MXIII Android STB device.
> > 
> > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> > ---
> >  .../devicetree/bindings/media/rc.yaml         |  1 +
> >  drivers/media/rc/keymaps/Makefile             |  1 +
> >  drivers/media/rc/keymaps/rc-beelink-mxiii.c   | 54 +++++++++++++++++++
> >  include/media/rc-map.h                        |  1 +
> >  4 files changed, 57 insertions(+)
> >  create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c
> > 
> > diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
> > index 266f1d5cae51..f390a5d2c82d 100644
> > --- a/Documentation/devicetree/bindings/media/rc.yaml
> > +++ b/Documentation/devicetree/bindings/media/rc.yaml
> > @@ -39,6 +39,7 @@ properties:
> >        - rc-avertv-303
> >        - rc-azurewave-ad-tu700
> >        - rc-beelink-gs1
> > +      - rc-beelink-mxiii
> 
> Bindings are separate patches. Didn't you get such feedback already?

The only change for new keymaps is an added entry to the rc-map-name enum.
In the past, new keymaps have been accepted with that single line in the
same commit.


Sean
Rob Herring Jan. 30, 2023, 9:30 p.m. UTC | #2
On Sun, Jan 29, 2023 at 08:38:06AM +0000, Sean Young wrote:
> On Sat, Jan 28, 2023 at 11:11:32AM +0100, Krzysztof Kozlowski wrote:
> > On 28/01/2023 04:41, Christian Hewitt wrote:
> > > Add a keymap and bindings for the simple IR (NEC) remote used with
> > > the Beelink Mini MXIII Android STB device.
> > > 
> > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> > > ---
> > >  .../devicetree/bindings/media/rc.yaml         |  1 +
> > >  drivers/media/rc/keymaps/Makefile             |  1 +
> > >  drivers/media/rc/keymaps/rc-beelink-mxiii.c   | 54 +++++++++++++++++++
> > >  include/media/rc-map.h                        |  1 +
> > >  4 files changed, 57 insertions(+)
> > >  create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c
> > > 
> > > diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
> > > index 266f1d5cae51..f390a5d2c82d 100644
> > > --- a/Documentation/devicetree/bindings/media/rc.yaml
> > > +++ b/Documentation/devicetree/bindings/media/rc.yaml
> > > @@ -39,6 +39,7 @@ properties:
> > >        - rc-avertv-303
> > >        - rc-azurewave-ad-tu700
> > >        - rc-beelink-gs1
> > > +      - rc-beelink-mxiii
> > 
> > Bindings are separate patches. Didn't you get such feedback already?
> 
> The only change for new keymaps is an added entry to the rc-map-name enum.
> In the past, new keymaps have been accepted with that single line in the
> same commit.

It's been a checkpatch.pl warning since 2018. The separation is so that 
commit messages in the DT only repo[1] make sense.

Rob

[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
Sean Young Jan. 31, 2023, 12:28 p.m. UTC | #3
On Mon, Jan 30, 2023 at 03:30:20PM -0600, Rob Herring wrote:
> On Sun, Jan 29, 2023 at 08:38:06AM +0000, Sean Young wrote:
> > On Sat, Jan 28, 2023 at 11:11:32AM +0100, Krzysztof Kozlowski wrote:
> > > On 28/01/2023 04:41, Christian Hewitt wrote:
> > > > Add a keymap and bindings for the simple IR (NEC) remote used with
> > > > the Beelink Mini MXIII Android STB device.
> > > > 
> > > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> > > > ---
> > > >  .../devicetree/bindings/media/rc.yaml         |  1 +
> > > >  drivers/media/rc/keymaps/Makefile             |  1 +
> > > >  drivers/media/rc/keymaps/rc-beelink-mxiii.c   | 54 +++++++++++++++++++
> > > >  include/media/rc-map.h                        |  1 +
> > > >  4 files changed, 57 insertions(+)
> > > >  create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c
> > > > 
> > > > diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
> > > > index 266f1d5cae51..f390a5d2c82d 100644
> > > > --- a/Documentation/devicetree/bindings/media/rc.yaml
> > > > +++ b/Documentation/devicetree/bindings/media/rc.yaml
> > > > @@ -39,6 +39,7 @@ properties:
> > > >        - rc-avertv-303
> > > >        - rc-azurewave-ad-tu700
> > > >        - rc-beelink-gs1
> > > > +      - rc-beelink-mxiii
> > > 
> > > Bindings are separate patches. Didn't you get such feedback already?
> > 
> > The only change for new keymaps is an added entry to the rc-map-name enum.
> > In the past, new keymaps have been accepted with that single line in the
> > same commit.
> 
> It's been a checkpatch.pl warning since 2018. The separation is so that 
> commit messages in the DT only repo[1] make sense.

Ok, makes sense. 

Thanks,

Sean
Christian Hewitt Jan. 31, 2023, 1 p.m. UTC | #4
> On 31 Jan 2023, at 4:28 pm, Sean Young <sean@mess.org> wrote:
> 
> On Mon, Jan 30, 2023 at 03:30:20PM -0600, Rob Herring wrote:
>> On Sun, Jan 29, 2023 at 08:38:06AM +0000, Sean Young wrote:
>>> On Sat, Jan 28, 2023 at 11:11:32AM +0100, Krzysztof Kozlowski wrote:
>>>> On 28/01/2023 04:41, Christian Hewitt wrote:
>>>>> Add a keymap and bindings for the simple IR (NEC) remote used with
>>>>> the Beelink Mini MXIII Android STB device.
>>>>> 
>>>>> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
>>>>> ---
>>>>> .../devicetree/bindings/media/rc.yaml         |  1 +
>>>>> drivers/media/rc/keymaps/Makefile             |  1 +
>>>>> drivers/media/rc/keymaps/rc-beelink-mxiii.c   | 54 +++++++++++++++++++
>>>>> include/media/rc-map.h                        |  1 +
>>>>> 4 files changed, 57 insertions(+)
>>>>> create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c
>>>>> 
>>>>> diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
>>>>> index 266f1d5cae51..f390a5d2c82d 100644
>>>>> --- a/Documentation/devicetree/bindings/media/rc.yaml
>>>>> +++ b/Documentation/devicetree/bindings/media/rc.yaml
>>>>> @@ -39,6 +39,7 @@ properties:
>>>>>       - rc-avertv-303
>>>>>       - rc-azurewave-ad-tu700
>>>>>       - rc-beelink-gs1
>>>>> +      - rc-beelink-mxiii
>>>> 
>>>> Bindings are separate patches. Didn't you get such feedback already?
>>> 
>>> The only change for new keymaps is an added entry to the rc-map-name enum.
>>> In the past, new keymaps have been accepted with that single line in the
>>> same commit.
>> 
>> It's been a checkpatch.pl warning since 2018. The separation is so that 
>> commit messages in the DT only repo[1] make sense.
> 
> Ok, makes sense. 

I will resend v2 series(s) with the bindings separated. Are there any other
issues to address?

Christian
Sean Young Jan. 31, 2023, 2:09 p.m. UTC | #5
On Sat, Jan 28, 2023 at 03:41:17AM +0000, Christian Hewitt wrote:
> Add a keymap and bindings for the simple IR (NEC) remote used with
> the Beelink Mini MXIII Android STB device.
> 
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
>  .../devicetree/bindings/media/rc.yaml         |  1 +
>  drivers/media/rc/keymaps/Makefile             |  1 +
>  drivers/media/rc/keymaps/rc-beelink-mxiii.c   | 54 +++++++++++++++++++
>  include/media/rc-map.h                        |  1 +
>  4 files changed, 57 insertions(+)
>  create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c
> 
> diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
> index 266f1d5cae51..f390a5d2c82d 100644
> --- a/Documentation/devicetree/bindings/media/rc.yaml
> +++ b/Documentation/devicetree/bindings/media/rc.yaml
> @@ -39,6 +39,7 @@ properties:
>        - rc-avertv-303
>        - rc-azurewave-ad-tu700
>        - rc-beelink-gs1
> +      - rc-beelink-mxiii
>        - rc-behold
>        - rc-behold-columbus
>        - rc-budget-ci-old
> diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
> index ec0361b0b758..03bc9a8d355e 100644
> --- a/drivers/media/rc/keymaps/Makefile
> +++ b/drivers/media/rc/keymaps/Makefile
> @@ -22,6 +22,7 @@ obj-$(CONFIG_RC_MAP) += \
>  			rc-avertv-303.o \
>  			rc-azurewave-ad-tu700.o \
>  			rc-beelink-gs1.o \
> +			rc-beelink-mxiii.o \
>  			rc-behold-columbus.o \
>  			rc-behold.o \
>  			rc-budget-ci-old.o \
> diff --git a/drivers/media/rc/keymaps/rc-beelink-mxiii.c b/drivers/media/rc/keymaps/rc-beelink-mxiii.c
> new file mode 100644
> index 000000000000..09b77295e0a3
> --- /dev/null
> +++ b/drivers/media/rc/keymaps/rc-beelink-mxiii.c
> @@ -0,0 +1,54 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +//
> +// Copyright (C) 2019 Christian Hewitt <christianshewitt@gmail.com>
> +
> +#include <media/rc-map.h>
> +#include <linux/module.h>
> +
> +//
> +// Keytable for the Beelink Mini MXIII remote control
> +//
> +
> +static struct rc_map_table beelink_mxiii[] = {
> +	{ 0xb2dc, KEY_POWER },
> +
> +	{ 0xb288, KEY_MUTE },

I'm guessing this is the mouse button. It should say so in a comment, if it
is.

Thanks,
Sean

> +	{ 0xb282, KEY_HOME },
> +
> +	{ 0xb2ca, KEY_UP },
> +	{ 0xb299, KEY_LEFT },
> +	{ 0xb2ce, KEY_OK },
> +	{ 0xb2c1, KEY_RIGHT },
> +	{ 0xb2d2, KEY_DOWN },
> +
> +	{ 0xb2c5, KEY_MENU },
> +	{ 0xb29a, KEY_BACK },
> +
> +	{ 0xb281, KEY_VOLUMEDOWN },
> +	{ 0xb280, KEY_VOLUMEUP },
> +};
> +
> +static struct rc_map_list beelink_mxiii_map = {
> +	.map = {
> +		.scan     = beelink_mxiii,
> +		.size     = ARRAY_SIZE(beelink_mxiii),
> +		.rc_proto = RC_PROTO_NEC,
> +		.name     = RC_MAP_BEELINK_MXIII,
> +	}
> +};
> +
> +static int __init init_rc_map_beelink_mxiii(void)
> +{
> +	return rc_map_register(&beelink_mxiii_map);
> +}
> +
> +static void __exit exit_rc_map_beelink_mxiii(void)
> +{
> +	rc_map_unregister(&beelink_mxiii_map);
> +}
> +
> +module_init(init_rc_map_beelink_mxiii)
> +module_exit(exit_rc_map_beelink_mxiii)
> +
> +MODULE_LICENSE("GPL");
> +MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com");
> diff --git a/include/media/rc-map.h b/include/media/rc-map.h
> index 5178dcae5ff7..dadd4d27a760 100644
> --- a/include/media/rc-map.h
> +++ b/include/media/rc-map.h
> @@ -225,6 +225,7 @@ struct rc_map *rc_map_get(const char *name);
>  #define RC_MAP_AVERTV_303                "rc-avertv-303"
>  #define RC_MAP_AZUREWAVE_AD_TU700        "rc-azurewave-ad-tu700"
>  #define RC_MAP_BEELINK_GS1               "rc-beelink-gs1"
> +#define RC_MAP_BEELINK_MXIII             "rc-beelink-mxiii"
>  #define RC_MAP_BEHOLD                    "rc-behold"
>  #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
>  #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"
> -- 
> 2.34.1
Christian Hewitt Jan. 31, 2023, 2:11 p.m. UTC | #6
> On 31 Jan 2023, at 6:09 pm, Sean Young <sean@mess.org> wrote:
> 
> On Sat, Jan 28, 2023 at 03:41:17AM +0000, Christian Hewitt wrote:
>> Add a keymap and bindings for the simple IR (NEC) remote used with
>> the Beelink Mini MXIII Android STB device.
>> 
>> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
>> ---
>> .../devicetree/bindings/media/rc.yaml         |  1 +
>> drivers/media/rc/keymaps/Makefile             |  1 +
>> drivers/media/rc/keymaps/rc-beelink-mxiii.c   | 54 +++++++++++++++++++
>> include/media/rc-map.h                        |  1 +
>> 4 files changed, 57 insertions(+)
>> create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c
>> 
>> diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
>> index 266f1d5cae51..f390a5d2c82d 100644
>> --- a/Documentation/devicetree/bindings/media/rc.yaml
>> +++ b/Documentation/devicetree/bindings/media/rc.yaml
>> @@ -39,6 +39,7 @@ properties:
>>       - rc-avertv-303
>>       - rc-azurewave-ad-tu700
>>       - rc-beelink-gs1
>> +      - rc-beelink-mxiii
>>       - rc-behold
>>       - rc-behold-columbus
>>       - rc-budget-ci-old
>> diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
>> index ec0361b0b758..03bc9a8d355e 100644
>> --- a/drivers/media/rc/keymaps/Makefile
>> +++ b/drivers/media/rc/keymaps/Makefile
>> @@ -22,6 +22,7 @@ obj-$(CONFIG_RC_MAP) += \
>> 			rc-avertv-303.o \
>> 			rc-azurewave-ad-tu700.o \
>> 			rc-beelink-gs1.o \
>> +			rc-beelink-mxiii.o \
>> 			rc-behold-columbus.o \
>> 			rc-behold.o \
>> 			rc-budget-ci-old.o \
>> diff --git a/drivers/media/rc/keymaps/rc-beelink-mxiii.c b/drivers/media/rc/keymaps/rc-beelink-mxiii.c
>> new file mode 100644
>> index 000000000000..09b77295e0a3
>> --- /dev/null
>> +++ b/drivers/media/rc/keymaps/rc-beelink-mxiii.c
>> @@ -0,0 +1,54 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +//
>> +// Copyright (C) 2019 Christian Hewitt <christianshewitt@gmail.com>
>> +
>> +#include <media/rc-map.h>
>> +#include <linux/module.h>
>> +
>> +//
>> +// Keytable for the Beelink Mini MXIII remote control
>> +//
>> +
>> +static struct rc_map_table beelink_mxiii[] = {
>> +	{ 0xb2dc, KEY_POWER },
>> +
>> +	{ 0xb288, KEY_MUTE },
> 
> I'm guessing this is the mouse button. It should say so in a comment, if it
> is.

It’s not (for once). It’s a rather minimal remote. Nothing
as fancy as mouse support :)

Christian

> Thanks,
> Sean
> 
>> +	{ 0xb282, KEY_HOME },
>> +
>> +	{ 0xb2ca, KEY_UP },
>> +	{ 0xb299, KEY_LEFT },
>> +	{ 0xb2ce, KEY_OK },
>> +	{ 0xb2c1, KEY_RIGHT },
>> +	{ 0xb2d2, KEY_DOWN },
>> +
>> +	{ 0xb2c5, KEY_MENU },
>> +	{ 0xb29a, KEY_BACK },
>> +
>> +	{ 0xb281, KEY_VOLUMEDOWN },
>> +	{ 0xb280, KEY_VOLUMEUP },
>> +};
>> +
>> +static struct rc_map_list beelink_mxiii_map = {
>> +	.map = {
>> +		.scan     = beelink_mxiii,
>> +		.size     = ARRAY_SIZE(beelink_mxiii),
>> +		.rc_proto = RC_PROTO_NEC,
>> +		.name     = RC_MAP_BEELINK_MXIII,
>> +	}
>> +};
>> +
>> +static int __init init_rc_map_beelink_mxiii(void)
>> +{
>> +	return rc_map_register(&beelink_mxiii_map);
>> +}
>> +
>> +static void __exit exit_rc_map_beelink_mxiii(void)
>> +{
>> +	rc_map_unregister(&beelink_mxiii_map);
>> +}
>> +
>> +module_init(init_rc_map_beelink_mxiii)
>> +module_exit(exit_rc_map_beelink_mxiii)
>> +
>> +MODULE_LICENSE("GPL");
>> +MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com");
>> diff --git a/include/media/rc-map.h b/include/media/rc-map.h
>> index 5178dcae5ff7..dadd4d27a760 100644
>> --- a/include/media/rc-map.h
>> +++ b/include/media/rc-map.h
>> @@ -225,6 +225,7 @@ struct rc_map *rc_map_get(const char *name);
>> #define RC_MAP_AVERTV_303                "rc-avertv-303"
>> #define RC_MAP_AZUREWAVE_AD_TU700        "rc-azurewave-ad-tu700"
>> #define RC_MAP_BEELINK_GS1               "rc-beelink-gs1"
>> +#define RC_MAP_BEELINK_MXIII             "rc-beelink-mxiii"
>> #define RC_MAP_BEHOLD                    "rc-behold"
>> #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
>> #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"
>> -- 
>> 2.34.1
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
index 266f1d5cae51..f390a5d2c82d 100644
--- a/Documentation/devicetree/bindings/media/rc.yaml
+++ b/Documentation/devicetree/bindings/media/rc.yaml
@@ -39,6 +39,7 @@  properties:
       - rc-avertv-303
       - rc-azurewave-ad-tu700
       - rc-beelink-gs1
+      - rc-beelink-mxiii
       - rc-behold
       - rc-behold-columbus
       - rc-budget-ci-old
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index ec0361b0b758..03bc9a8d355e 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -22,6 +22,7 @@  obj-$(CONFIG_RC_MAP) += \
 			rc-avertv-303.o \
 			rc-azurewave-ad-tu700.o \
 			rc-beelink-gs1.o \
+			rc-beelink-mxiii.o \
 			rc-behold-columbus.o \
 			rc-behold.o \
 			rc-budget-ci-old.o \
diff --git a/drivers/media/rc/keymaps/rc-beelink-mxiii.c b/drivers/media/rc/keymaps/rc-beelink-mxiii.c
new file mode 100644
index 000000000000..09b77295e0a3
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-beelink-mxiii.c
@@ -0,0 +1,54 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (C) 2019 Christian Hewitt <christianshewitt@gmail.com>
+
+#include <media/rc-map.h>
+#include <linux/module.h>
+
+//
+// Keytable for the Beelink Mini MXIII remote control
+//
+
+static struct rc_map_table beelink_mxiii[] = {
+	{ 0xb2dc, KEY_POWER },
+
+	{ 0xb288, KEY_MUTE },
+	{ 0xb282, KEY_HOME },
+
+	{ 0xb2ca, KEY_UP },
+	{ 0xb299, KEY_LEFT },
+	{ 0xb2ce, KEY_OK },
+	{ 0xb2c1, KEY_RIGHT },
+	{ 0xb2d2, KEY_DOWN },
+
+	{ 0xb2c5, KEY_MENU },
+	{ 0xb29a, KEY_BACK },
+
+	{ 0xb281, KEY_VOLUMEDOWN },
+	{ 0xb280, KEY_VOLUMEUP },
+};
+
+static struct rc_map_list beelink_mxiii_map = {
+	.map = {
+		.scan     = beelink_mxiii,
+		.size     = ARRAY_SIZE(beelink_mxiii),
+		.rc_proto = RC_PROTO_NEC,
+		.name     = RC_MAP_BEELINK_MXIII,
+	}
+};
+
+static int __init init_rc_map_beelink_mxiii(void)
+{
+	return rc_map_register(&beelink_mxiii_map);
+}
+
+static void __exit exit_rc_map_beelink_mxiii(void)
+{
+	rc_map_unregister(&beelink_mxiii_map);
+}
+
+module_init(init_rc_map_beelink_mxiii)
+module_exit(exit_rc_map_beelink_mxiii)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com");
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 5178dcae5ff7..dadd4d27a760 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -225,6 +225,7 @@  struct rc_map *rc_map_get(const char *name);
 #define RC_MAP_AVERTV_303                "rc-avertv-303"
 #define RC_MAP_AZUREWAVE_AD_TU700        "rc-azurewave-ad-tu700"
 #define RC_MAP_BEELINK_GS1               "rc-beelink-gs1"
+#define RC_MAP_BEELINK_MXIII             "rc-beelink-mxiii"
 #define RC_MAP_BEHOLD                    "rc-behold"
 #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
 #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"