Skip to contentSkip to conversation

staging: vt6656: Move firmware functions into main_usb.

PATCH New Malcolm Priestley 1 participant 1 message Apr 19, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: vt6656: Move firmware functions into main_usb.

The firmware function are not that complicated so move them into main_usb as static functions in callers visibility

Firmware definitions moved to device.h and MODULE_FIRMWARE move to below module_usb_driver.

---
 drivers/staging/vt6656/Makefile   |   3 +-
 drivers/staging/vt6656/device.h   |   4 ++
 drivers/staging/vt6656/firmware.c | 106 ------------------------------
 drivers/staging/vt6656/firmware.h |  25 -------
 drivers/staging/vt6656/main_usb.c |  81 ++++++++++++++++++++++-
 5 files changed, 85 insertions(+), 134 deletions(-)
 delete mode 100644 drivers/staging/vt6656/firmware.c
 delete mode 100644 drivers/staging/vt6656/firmware.h
drivers/staging/vt6656/Makefile +1 -2
index 375f54e9f58b..a0f3862dea75 100644
@@ -13,7 +13,6 @@ vt6656_stage-y +=	main_usb.o \
 			key.o \
 			rf.o \
 			usbpipe.o \
-			channel.o \
-			firmware.o
+			channel.o
 
 obj-$(CONFIG_VT6656) +=	vt6656_stage.o
drivers/staging/vt6656/device.h +4 -0
index 1630d2163a23..613062ad0122 100644
@@ -73,6 +73,10 @@
 
 #define DEVICE_VERSION			"mac80211"
 
+#define FIRMWARE_VERSION		0x133		/* version 1.51 */
+#define FIRMWARE_NAME			"vntwusb.fw"
+#define FIRMWARE_CHUNK_SIZE		0x400
+
 #define CONFIG_PATH			"/etc/vntconfiguration.dat"
 
 #define MAX_UINTS			8
drivers/staging/vt6656/firmware.c deleted +0 -106

106 lines not on this page · raw message

drivers/staging/vt6656/firmware.h deleted +0 -25
deleted file mode 100644
index 161126faf396..000000000000
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
- * All rights reserved.
- *
- * File: firmware.h
- *
- * Purpose: Version and Release Information
- *
- * Author: Yiching Chen
- *
- * Date: May 20, 2004
- *
- */
-
-#ifndef __FIRMWARE_H__
-#define __FIRMWARE_H__
-
-#include "device.h"
-
-int vnt_download_firmware(struct vnt_private *priv);
-int vnt_firmware_branch_to_sram(struct vnt_private *priv);
-int vnt_check_firmware_version(struct vnt_private *priv);
-
-#endif /* __FIRMWARE_H__ */
drivers/staging/vt6656/main_usb.c +80 -1

96 lines not on this page · raw message

Signature · 1 line
2.25.1