add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/media/usb/dvb-usb/digitv.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /* DVB USB compliant linux driver for Nebula Electronics uDigiTV DVB-T USB2.0
2
3
  * receiver
3
4
  *
..
..
@@ -5,11 +6,7 @@
5
6
  *
6
7
  * partly based on the SDK published by Nebula Electronics
7
8
  *
8
- *	This program is free software; you can redistribute it and/or modify it
9
- *	under the terms of the GNU General Public License as published by the Free
10
- *	Software Foundation, version 2.
11
- *
12
- * see Documentation/media/dvb-drivers/dvb-usb.rst for more information
9
+ * see Documentation/driver-api/media/drivers/dvb-usb.rst for more information
13
10
  */
14
11
 #include "digitv.h"
15
12
 
..
..
@@ -93,9 +90,10 @@
93
90
 };
94
91
 
95
92
 /* Callbacks for DVB USB */
96
-static int digitv_identify_state (struct usb_device *udev, struct
97
-		dvb_usb_device_properties *props, struct dvb_usb_device_description **desc,
98
-		int *cold)
93
+static int digitv_identify_state(struct usb_device *udev,
94
+				 const struct dvb_usb_device_properties *props,
95
+				 const struct dvb_usb_device_description **desc,
96
+				 int *cold)
99
97
 {
100
98
 	*cold = udev->descriptor.iManufacturer == 0 && udev->descriptor.iProduct == 0;
101
99
 	return 0;
..
..
@@ -233,14 +231,15 @@
233
231
 
234
232
 static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
235
233
 {
234
+	struct rc_map_table *entry;
236
235
 	int ret, i;
237
-	u8 key[5];
236
+	u8 key[4];
238
237
 	u8 b[4] = { 0 };
239
238
 
240
239
 	*event = 0;
241
240
 	*state = REMOTE_NO_KEY_PRESSED;
242
241
 
243
-	ret = digitv_ctrl_msg(d, USB_READ_REMOTE, 0, NULL, 0, &key[1], 4);
242
+	ret = digitv_ctrl_msg(d, USB_READ_REMOTE, 0, NULL, 0, key, 4);
244
243
 	if (ret)
245
244
 		return ret;
246
245
 
..
..
@@ -251,20 +250,21 @@
251
250
 		return ret;
252
251
 
253
252
 	/* if something is inside the buffer, simulate key press */
254
-	if (key[1] != 0)
255
-	{
256
-		  for (i = 0; i < d->props.rc.legacy.rc_map_size; i++) {
257
-			if (rc5_custom(&d->props.rc.legacy.rc_map_table[i]) == key[1] &&
258
-			    rc5_data(&d->props.rc.legacy.rc_map_table[i]) == key[2]) {
259
-				*event = d->props.rc.legacy.rc_map_table[i].keycode;
253
+	if (key[0] != 0) {
254
+		for (i = 0; i < d->props.rc.legacy.rc_map_size; i++) {
255
+			entry = &d->props.rc.legacy.rc_map_table[i];
256
+
257
+			if (rc5_custom(entry) == key[0] &&
258
+			    rc5_data(entry) == key[1]) {
259
+				*event = entry->keycode;
260
260
 				*state = REMOTE_KEY_PRESSED;
261
261
 				return 0;
262
262
 			}
263
263
 		}
264
+
265
+		deb_rc("key: %*ph\n", 4, key);
264
266
 	}
265
267
 
266
-	if (key[0] != 0)
267
-		deb_rc("key: %*ph\n", 5, key);
268
268
 	return 0;
269
269
 }
270
270