[PATCH 1/2] tty/vt: defkeymap.c_shipped, little unification with loadkeys

[PATCH 1/2] tty/vt: defkeymap.c_shipped, little unification with loadkeys

[Jiri Slaby]

loadkeys 2.4.0 currently:
* notes the use of --unicode to the output, and
* uses "unsigned short" for key_maps instead of "ushort".

So make our shipped file consistent with the generated output in this
regard.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/tty/vt/defkeymap.c_shipped | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/vt/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped
index 094d95bf0005..0c043e4f292e 100644
--- a/drivers/tty/vt/defkeymap.c_shipped
+++ b/drivers/tty/vt/defkeymap.c_shipped
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
-/* Do not edit this file! It was automatically generated by   */
-/*    loadkeys --mktable defkeymap.map > defkeymap.c          */
+/* Do not edit this file! It was automatically generated by     */
+/*    loadkeys --mktable --unicode defkeymap.map > defkeymap.c  */
 
 #include <linux/types.h>
 #include <linux/keyboard.h>
@@ -139,7 +139,7 @@ static unsigned short ctrl_alt_map[NR_KEYS] = {
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
-ushort *key_maps[MAX_NR_KEYMAPS] = {
+unsigned short *key_maps[MAX_NR_KEYMAPS] = {
 	plain_map, shift_map, altgr_map, NULL,
 	ctrl_map, shift_ctrl_map, NULL, NULL,
 	alt_map, NULL, NULL, NULL,
-- 
2.36.1

[PATCH 2/2] tty/vt: Makefile, add --unicode for loadkeys invocation

[Jiri Slaby]

For a long time, we generate unicode tables using loadkeys. So fix
Makefile to use that flag too.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/tty/vt/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
index fe30ce512819..b3dfe9d5717e 100644
--- a/drivers/tty/vt/Makefile
+++ b/drivers/tty/vt/Makefile
@@ -30,6 +30,6 @@ $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 ifdef GENERATE_KEYMAP
 
 $(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
-	loadkeys --mktable $< > $@
+	loadkeys --mktable --unicode $< > $@
 
 endif
-- 
2.36.1

Re: [PATCH 2/2] tty/vt: Makefile, add --unicode for loadkeys invocation

[Andy Shevchenko]

On Thu, Jun 2, 2022 at 12:30 PM Jiri Slaby <jslaby@suse.cz> wrote:
>
> For a long time, we generate unicode tables using loadkeys. So fix
> Makefile to use that flag too.

generated

Does it make sense to add the Fixes tag?

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
>  drivers/tty/vt/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
> index fe30ce512819..b3dfe9d5717e 100644
> --- a/drivers/tty/vt/Makefile
> +++ b/drivers/tty/vt/Makefile
> @@ -30,6 +30,6 @@ $(obj)/defkeymap.o:  $(obj)/defkeymap.c
>  ifdef GENERATE_KEYMAP
>
>  $(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
> -       loadkeys --mktable $< > $@
> +       loadkeys --mktable --unicode $< > $@
>
>  endif
> --
> 2.36.1
>


-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 2/2] tty/vt: Makefile, add --unicode for loadkeys invocation

[Jiri Slaby]

On 06. 06. 22, 16:35, Andy Shevchenko wrote:
> On Thu, Jun 2, 2022 at 12:30 PM Jiri Slaby <jslaby@suse.cz> wrote:
>>
>> For a long time, we generate unicode tables using loadkeys. So fix
>> Makefile to use that flag too.
> 
> generated

We still do, but I didn't even know there is even a rule for that ;).

> Does it make sense to add the Fixes tag?

I don't think so -- I don't think anyone ran the rule in the past decade 
:P. I.e. it'd be pre-git anyway.

> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> 
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
>> ---
>>   drivers/tty/vt/Makefile | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
>> index fe30ce512819..b3dfe9d5717e 100644
>> --- a/drivers/tty/vt/Makefile
>> +++ b/drivers/tty/vt/Makefile
>> @@ -30,6 +30,6 @@ $(obj)/defkeymap.o:  $(obj)/defkeymap.c
>>   ifdef GENERATE_KEYMAP
>>
>>   $(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
>> -       loadkeys --mktable $< > $@
>> +       loadkeys --mktable --unicode $< > $@
>>
>>   endif
>> --
>> 2.36.1
>>
> 
> 

thanks,
-- 
js
suse labs

Re: [PATCH 2/2] tty/vt: Makefile, add --unicode for loadkeys invocation

[Andy Shevchenko]

On Tue, Jun 7, 2022 at 7:42 AM Jiri Slaby <jirislaby@kernel.org> wrote:
> On 06. 06. 22, 16:35, Andy Shevchenko wrote:
> > On Thu, Jun 2, 2022 at 12:30 PM Jiri Slaby <jslaby@suse.cz> wrote:
> >>
> >> For a long time, we generate unicode tables using loadkeys. So fix
> >> Makefile to use that flag too.
> >
> > generated
>
> We still do, but I didn't even know there is even a rule for that ;).

I understand, but here is English stylistics like this. You need to
use past ind. or present perfect ("for a long time" dictates that).

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 2/2] tty/vt: Makefile, add --unicode for loadkeys invocation

[Andy Shevchenko]

On Tue, Jun 7, 2022 at 11:58 AM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
>
> On Tue, Jun 7, 2022 at 7:42 AM Jiri Slaby <jirislaby@kernel.org> wrote:
> > On 06. 06. 22, 16:35, Andy Shevchenko wrote:
> > > On Thu, Jun 2, 2022 at 12:30 PM Jiri Slaby <jslaby@suse.cz> wrote:
> > >>
> > >> For a long time, we generate unicode tables using loadkeys. So fix
> > >> Makefile to use that flag too.
> > >
> > > generated
> >
> > We still do, but I didn't even know there is even a rule for that ;).
>
> I understand, but here is English stylistics like this. You need to
> use past ind. or present perfect ("for a long time" dictates that).

Okay, now even more explanation, present perfect should be used here.

we have generated


-- 
With Best Regards,
Andy Shevchenko