update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/rc/keymaps/rc-msi-digivox-iii.c
..
..
@@ -1,21 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * MSI DIGIVOX mini III remote controller keytable
3
4
  *
4
5
  * Copyright (C) 2010 Antti Palosaari <crope@iki.fi>
5
- *
6
- *    This program is free software; you can redistribute it and/or modify
7
- *    it under the terms of the GNU General Public License as published by
8
- *    the Free Software Foundation; either version 2 of the License, or
9
- *    (at your option) any later version.
10
- *
11
- *    This program is distributed in the hope that it will be useful,
12
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- *    GNU General Public License for more details.
15
- *
16
- *    You should have received a copy of the GNU General Public License along
17
- *    with this program; if not, write to the Free Software Foundation, Inc.,
18
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
6
  */
20
7
 
21
8
 #include <media/rc-map.h>
..
..
@@ -27,22 +14,22 @@
27
14
    since rc-kworld-315u.c lacks NEC extended address byte. */
28
15
 static struct rc_map_table msi_digivox_iii[] = {
29
16
 	{ 0x61d601, KEY_VIDEO },           /* Source */
30
-	{ 0x61d602, KEY_3 },
17
+	{ 0x61d602, KEY_NUMERIC_3 },
31
18
 	{ 0x61d603, KEY_POWER },           /* ShutDown */
32
-	{ 0x61d604, KEY_1 },
33
-	{ 0x61d605, KEY_5 },
34
-	{ 0x61d606, KEY_6 },
19
+	{ 0x61d604, KEY_NUMERIC_1 },
20
+	{ 0x61d605, KEY_NUMERIC_5 },
21
+	{ 0x61d606, KEY_NUMERIC_6 },
35
22
 	{ 0x61d607, KEY_CHANNELDOWN },     /* CH- */
36
-	{ 0x61d608, KEY_2 },
23
+	{ 0x61d608, KEY_NUMERIC_2 },
37
24
 	{ 0x61d609, KEY_CHANNELUP },       /* CH+ */
38
-	{ 0x61d60a, KEY_9 },
25
+	{ 0x61d60a, KEY_NUMERIC_9 },
39
26
 	{ 0x61d60b, KEY_ZOOM },            /* Zoom */
40
-	{ 0x61d60c, KEY_7 },
41
-	{ 0x61d60d, KEY_8 },
27
+	{ 0x61d60c, KEY_NUMERIC_7 },
28
+	{ 0x61d60d, KEY_NUMERIC_8 },
42
29
 	{ 0x61d60e, KEY_VOLUMEUP },        /* Vol+ */
43
-	{ 0x61d60f, KEY_4 },
30
+	{ 0x61d60f, KEY_NUMERIC_4 },
44
31
 	{ 0x61d610, KEY_ESC },             /* [back up arrow] */
45
-	{ 0x61d611, KEY_0 },
32
+	{ 0x61d611, KEY_NUMERIC_0 },
46
33
 	{ 0x61d612, KEY_OK },              /* [enter arrow] */
47
34
 	{ 0x61d613, KEY_VOLUMEDOWN },      /* Vol- */
48
35
 	{ 0x61d614, KEY_RECORD },          /* Rec */
..
..
@@ -64,7 +51,7 @@
64
51
 	.map = {
65
52
 		.scan     = msi_digivox_iii,
66
53
 		.size     = ARRAY_SIZE(msi_digivox_iii),
67
-		.rc_proto = RC_PROTO_NEC,
54
+		.rc_proto = RC_PROTO_NECX,
68
55
 		.name     = RC_MAP_MSI_DIGIVOX_III,
69
56
 	}
70
57
 };