|
@@ -35,8 +35,8 @@
|
|
|
#include "control.h"
|
|
|
#include "rndis.h"
|
|
|
|
|
|
-static int msglevel =MSG_LEVEL_INFO;
|
|
|
-//static int msglevel =MSG_LEVEL_DEBUG;
|
|
|
+static int msglevel = MSG_LEVEL_INFO;
|
|
|
+//static int msglevel = MSG_LEVEL_DEBUG;
|
|
|
|
|
|
#define FIRMWARE_VERSION 0x133 /* version 1.51 */
|
|
|
#define FIRMWARE_NAME "vntwusb.fw"
|
|
@@ -72,18 +72,17 @@ int FIRMWAREbDownload(struct vnt_private *pDevice)
|
|
|
memcpy(pBuffer, fw->data + ii, wLength);
|
|
|
|
|
|
NdisStatus = CONTROLnsRequestOutAsyn(pDevice,
|
|
|
- 0,
|
|
|
- 0x1200+ii,
|
|
|
- 0x0000,
|
|
|
- wLength,
|
|
|
- pBuffer
|
|
|
- );
|
|
|
+ 0,
|
|
|
+ 0x1200+ii,
|
|
|
+ 0x0000,
|
|
|
+ wLength,
|
|
|
+ pBuffer);
|
|
|
|
|
|
DBG_PRT(MSG_LEVEL_DEBUG,
|
|
|
KERN_INFO"Download firmware...%d %zu\n", ii, fw->size);
|
|
|
if (NdisStatus != STATUS_SUCCESS)
|
|
|
goto free_fw;
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
result = true;
|
|
|
free_fw:
|
|
@@ -101,48 +100,46 @@ int FIRMWAREbBrach2Sram(struct vnt_private *pDevice)
|
|
|
{
|
|
|
int NdisStatus;
|
|
|
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n");
|
|
|
-
|
|
|
- NdisStatus = CONTROLnsRequestOut(pDevice,
|
|
|
- 1,
|
|
|
- 0x1200,
|
|
|
- 0x0000,
|
|
|
- 0,
|
|
|
- NULL
|
|
|
- );
|
|
|
-
|
|
|
- if (NdisStatus != STATUS_SUCCESS) {
|
|
|
- return (false);
|
|
|
- } else {
|
|
|
- return (true);
|
|
|
- }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n");
|
|
|
+
|
|
|
+ NdisStatus = CONTROLnsRequestOut(pDevice,
|
|
|
+ 1,
|
|
|
+ 0x1200,
|
|
|
+ 0x0000,
|
|
|
+ 0,
|
|
|
+ NULL);
|
|
|
+ if (NdisStatus != STATUS_SUCCESS) {
|
|
|
+ return (false);
|
|
|
+ } else {
|
|
|
+ return (true);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
int FIRMWAREbCheckVersion(struct vnt_private *pDevice)
|
|
|
{
|
|
|
int ntStatus;
|
|
|
|
|
|
- ntStatus = CONTROLnsRequestIn(pDevice,
|
|
|
- MESSAGE_TYPE_READ,
|
|
|
- 0,
|
|
|
- MESSAGE_REQUEST_VERSION,
|
|
|
- 2,
|
|
|
- (u8 *) &(pDevice->wFirmwareVersion));
|
|
|
-
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Version [%04x]\n", pDevice->wFirmwareVersion);
|
|
|
- if (ntStatus != STATUS_SUCCESS) {
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Invalid.\n");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (pDevice->wFirmwareVersion == 0xFFFF) {
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"In Loader.\n");
|
|
|
- return false;
|
|
|
- }
|
|
|
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Version [%04x]\n", pDevice->wFirmwareVersion);
|
|
|
- if (pDevice->wFirmwareVersion < FIRMWARE_VERSION) {
|
|
|
- // branch to loader for download new firmware
|
|
|
- FIRMWAREbBrach2Sram(pDevice);
|
|
|
- return false;
|
|
|
- }
|
|
|
- return true;
|
|
|
+ ntStatus = CONTROLnsRequestIn(pDevice,
|
|
|
+ MESSAGE_TYPE_READ,
|
|
|
+ 0,
|
|
|
+ MESSAGE_REQUEST_VERSION,
|
|
|
+ 2,
|
|
|
+ (u8 *) &(pDevice->wFirmwareVersion));
|
|
|
+
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Version [%04x]\n", pDevice->wFirmwareVersion);
|
|
|
+ if (ntStatus != STATUS_SUCCESS) {
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Invalid.\n");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (pDevice->wFirmwareVersion == 0xFFFF) {
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"In Loader.\n");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Version [%04x]\n", pDevice->wFirmwareVersion);
|
|
|
+ if (pDevice->wFirmwareVersion < FIRMWARE_VERSION) {
|
|
|
+ // branch to loader for download new firmware
|
|
|
+ FIRMWAREbBrach2Sram(pDevice);
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ return true;
|
|
|
}
|