Skip to content

Commit 279aba4

Browse files
rohimish-qcrohimish-qc
committed
Mainline code with QUD legacy repo
1 parent b7815fc commit 279aba4

30 files changed

Lines changed: 622 additions & 464 deletions

‎src/windows/filter/qcfilter.c‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ QCFilterAddDevice(
233233

234234
QCFLT_DbgPrint(DBG_LEVEL_DETAIL, ("QCFilterAddDevice : Initialize RemoveLock\n"));
235235
IoInitializeRemoveLock(&QCdevExt->RemoveLock, POOL_TAG, 1, 100);
236-
NTstatus = QCFilter_InitializeDeviceExt(QCdeviceObject);
236+
NTstatus = QCFLT_InitializeDeviceExt( QCdeviceObject );
237237
if (NTstatus != STATUS_SUCCESS)
238238
{
239239
IoDeleteDevice(QCdeviceObject);
240240
return STATUS_UNSUCCESSFUL;
241241
}
242-
NTstatus = QCFilter_StartFilterThread(QCdeviceObject);
242+
NTstatus = QCFLT_StartFilterThread( QCdeviceObject );
243243
if (NTstatus != STATUS_SUCCESS)
244244
{
245245
IoDeleteDevice(QCdeviceObject);
@@ -668,6 +668,7 @@ QCFilterUnload(PDRIVER_OBJECT DriverObject)
668668
#ifdef EVENT_TRACING
669669
WPP_CLEANUP(DriverObject);
670670
#endif
671+
return;
671672
}
672673

673674
/****************************************************************************
@@ -862,7 +863,7 @@ QCFilterDeleteControlObject(PDEVICE_OBJECT DeviceObject, PFILTER_DEVICE_INFO
862863
* returns: void
863864
*
864865
****************************************************************************/
865-
VOID DispatchCancelQueued(PDEVICE_OBJECT DeviceObject, PIRP Irp)
866+
VOID QCFLT_DispatchCancelQueued(PDEVICE_OBJECT DeviceObject, PIRP Irp)
866867
{
867868
KIRQL irql = KeGetCurrentIrql();
868869
PDEVICE_EXTENSION pDevExt = DeviceObject->DeviceExtension;
@@ -900,7 +901,7 @@ VOID DispatchCancelQueued(PDEVICE_OBJECT DeviceObject, PIRP Irp)
900901
DBG_LEVEL_ERROR,
901902
("<%s> DSP_Cxl: no action to active 0x%p\n", pDevExt->PortName, Irp)
902903
);
903-
IoSetCancelRoutine(Irp, DispatchCancelQueued);
904+
IoSetCancelRoutine(Irp, QCFLT_DispatchCancelQueued);
904905
}
905906

906907
QcReleaseSpinLock(&pDevExt->FilterSpinLock, levelOrHandle);
@@ -1348,7 +1349,7 @@ NTSTATUS QCFLT_GetStringDescriptor
13481349
* returns: STATUS_MORE_PROCESSING_REQUIRED
13491350
*
13501351
****************************************************************************/
1351-
NTSTATUS GetConfigurationCompletion(PDEVICE_OBJECT pDevObj, PIRP pIrp, PVOID pEvent)
1352+
NTSTATUS QCFLT_GetConfigurationCompletion(PDEVICE_OBJECT pDevObj, PIRP pIrp, PVOID pEvent)
13521353
{
13531354

13541355
KeSetEvent((PKEVENT)pEvent, IO_NO_INCREMENT, FALSE);
@@ -1461,7 +1462,7 @@ QCFilterDispatchIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
14611462
}
14621463

14631464
_IoMarkIrpPending(Irp);
1464-
IoSetCancelRoutine(Irp, DispatchCancelQueued);
1465+
IoSetCancelRoutine(Irp, QCFLT_DispatchCancelQueued);
14651466

14661467
status = STATUS_PENDING;
14671468
InsertTailList(&deviceExtension->DispatchQueue, &Irp->Tail.Overlay.ListEntry);
@@ -1504,7 +1505,7 @@ QCFilterDispatchIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
15041505
}
15051506

15061507
_IoMarkIrpPending(Irp);
1507-
IoSetCancelRoutine(Irp, DispatchCancelQueued);
1508+
IoSetCancelRoutine(Irp, QCFLT_DispatchCancelQueued);
15081509

15091510
status = STATUS_PENDING;
15101511
InsertTailList(&deviceExtension->DispatchQueue, &Irp->Tail.Overlay.ListEntry);
@@ -1793,7 +1794,7 @@ QCFilterDispatchIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
17931794
IoCopyCurrentIrpStackLocationToNext(Irp);
17941795

17951796
IoSetCompletionRoutine(Irp,
1796-
(PIO_COMPLETION_ROUTINE)GetConfigurationCompletion,
1797+
(PIO_COMPLETION_ROUTINE) QCFLT_GetConfigurationCompletion,
17971798
&event, TRUE, TRUE, TRUE);
17981799

17991800
status = IoCallDriver(deviceExtension->NextLowerDriver, Irp);
@@ -1817,7 +1818,7 @@ QCFilterDispatchIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
18171818
IoCopyCurrentIrpStackLocationToNext(Irp);
18181819

18191820
IoSetCompletionRoutine(Irp,
1820-
(PIO_COMPLETION_ROUTINE)GetConfigurationCompletion,
1821+
(PIO_COMPLETION_ROUTINE) QCFLT_GetConfigurationCompletion,
18211822
&event, TRUE, TRUE, TRUE);
18221823

18231824
status = IoCallDriver(deviceExtension->NextLowerDriver, Irp);
@@ -1853,7 +1854,7 @@ QCFilterDispatchIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
18531854
IoCopyCurrentIrpStackLocationToNext(Irp);
18541855

18551856
IoSetCompletionRoutine(Irp,
1856-
(PIO_COMPLETION_ROUTINE)GetConfigurationCompletion,
1857+
(PIO_COMPLETION_ROUTINE) QCFLT_GetConfigurationCompletion,
18571858
&event, TRUE, TRUE, TRUE);
18581859

18591860
status = IoCallDriver(deviceExtension->NextLowerDriver, Irp);
@@ -2259,7 +2260,7 @@ VOID QCFLT_Wait(PDEVICE_EXTENSION pDevExt, LONGLONG WaitTime)
22592260
*
22602261
*********************************************************************/
22612262
NTSTATUS
2262-
QCFilter_InitializeDeviceExt(PDEVICE_OBJECT deviceObject)
2263+
QCFLT_InitializeDeviceExt( PDEVICE_OBJECT deviceObject )
22632264
{
22642265
PDEVICE_EXTENSION pDevExt = deviceObject->DeviceExtension;
22652266
NTSTATUS ntStatus = STATUS_SUCCESS;
@@ -2984,14 +2985,14 @@ NTSTATUS getRegDwValueEntryData
29842985
NTSTATUS ntStatus = STATUS_SUCCESS;
29852986
PKEY_VALUE_FULL_INFORMATION pKeyValueInfo = NULL;
29862987

2987-
ntStatus = GetValueEntry(OpenRegKey, ValueEntryName, &pKeyValueInfo);
2988+
ntStatus = QCFLT_GetValueEntry( OpenRegKey, ValueEntryName, &pKeyValueInfo );
29882989

29892990
if (!NT_SUCCESS(ntStatus))
29902991
{
29912992
goto getRegDwValueEntryData_Return;
29922993
}
29932994

2994-
*pValueEntryData = GetDwordField(pKeyValueInfo);
2995+
*pValueEntryData = QCFLT_GetDwordField( pKeyValueInfo );
29952996

29962997
getRegDwValueEntryData_Return:
29972998

@@ -3023,14 +3024,14 @@ NTSTATUS getRegSzValueEntryData
30233024
NTSTATUS ntStatus = STATUS_SUCCESS;
30243025
PKEY_VALUE_FULL_INFORMATION pKeyValueInfo = NULL;
30253026

3026-
ntStatus = GetValueEntry(OpenRegKey, ValueEntryName, &pKeyValueInfo);
3027+
ntStatus = QCFLT_GetValueEntry( OpenRegKey, ValueEntryName, &pKeyValueInfo );
30273028

30283029
if (!NT_SUCCESS(ntStatus))
30293030
{
30303031
goto getRegSzValueEntryData_Return;
30313032
}
30323033

3033-
GetSzField(pKeyValueInfo, pValueEntryData);
3034+
QCFLT_GetSzField( pKeyValueInfo, pValueEntryData);
30343035

30353036
getRegSzValueEntryData_Return:
30363037

@@ -3056,7 +3057,7 @@ Routine Description:
30563057
NT Status
30573058
30583059
************************************************************************/
3059-
NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo)
3060+
NTSTATUS QCFLT_GetValueEntry( HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo )
30603061
{
30613062
PKEY_VALUE_FULL_INFORMATION pKeyValueInfo = NULL;
30623063
UNICODE_STRING Keyname;
@@ -3081,7 +3082,7 @@ NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION
30813082
{
30823083
*pKeyValInfo = NULL;
30833084
ntStatus = STATUS_NO_MEMORY;
3084-
goto GetValueEntry_Return;
3085+
goto QCFLT_GetValueEntry_Return;
30853086
}
30863087

30873088
ntStatus = ZwQueryValueKey(
@@ -3115,7 +3116,7 @@ NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION
31153116
}
31163117
}// while
31173118

3118-
GetValueEntry_Return:
3119+
QCFLT_GetValueEntry_Return:
31193120

31203121
return ntStatus;
31213122

@@ -3132,7 +3133,7 @@ Routine Description:
31323133
ULONG value of the value entry
31333134
31343135
************************************************************************/
3135-
ULONG GetDwordField(PKEY_VALUE_FULL_INFORMATION pKvi)
3136+
ULONG QCFLT_GetDwordField( PKEY_VALUE_FULL_INFORMATION pKvi )
31363137
{
31373138
ULONG dwVal, *pVal;
31383139

@@ -3152,7 +3153,7 @@ Routine Description:
31523153
Sz value of the value entry
31533154
31543155
************************************************************************/
3155-
VOID GetSzField(PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz)
3156+
VOID QCFLT_GetSzField( PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz )
31563157
{
31573158
UNICODE_STRING unicodeStr;
31583159
ANSI_STRING ansiStr;

‎src/windows/filter/qcfilter.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,13 @@ QCFilterCreateControlObject(PDEVICE_OBJECT DeviceObject, PFILTER_DEVICE_INFO pFi
406406
NTSTATUS
407407
QCFilterDeleteControlObject(PDEVICE_OBJECT DeviceObject, PFILTER_DEVICE_INFO pFilterDeviceInfo);
408408

409-
NTSTATUS QCFilter_StartFilterThread(PDEVICE_OBJECT devObj);
409+
NTSTATUS QCFLT_StartFilterThread(PDEVICE_OBJECT devObj);
410410

411411
VOID QCFilter_CancelFilterThread(PDEVICE_OBJECT pDevObj);
412412

413413
VOID QCFLT_Wait(PDEVICE_EXTENSION pDevExt, LONGLONG WaitTime);
414414

415-
NTSTATUS QCFilter_InitializeDeviceExt(PDEVICE_OBJECT deviceObject);
415+
NTSTATUS QCFLT_InitializeDeviceExt( PDEVICE_OBJECT deviceObject );
416416

417417
BOOLEAN QCFLT_IsIrpInQueue
418418
(
@@ -455,11 +455,11 @@ NTSTATUS getRegSzValueEntryData
455455
OUT PCHAR pValueEntryData
456456
);
457457

458-
NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo);
458+
NTSTATUS QCFLT_GetValueEntry( HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo );
459459

460-
ULONG GetDwordField(PKEY_VALUE_FULL_INFORMATION pKvi);
460+
ULONG QCFLT_GetDwordField( PKEY_VALUE_FULL_INFORMATION pKvi );
461461

462-
VOID GetSzField(PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz);
462+
VOID QCFLT_GetSzField(PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz);
463463

464464
BOOLEAN USBPNP_ValidateConfigDescriptor
465465
(

‎src/windows/filter/qcfilterioc.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ ProcessDispatchIrp
224224
*
225225
****************************************************************************/
226226
VOID
227-
ControlFilterThread(PVOID pContext)
227+
QCFLT_ControlFilterThread(PVOID pContext)
228228
{
229229
PDEVICE_OBJECT pDevobj = (PDEVICE_OBJECT)pContext;
230230
PDEVICE_EXTENSION pDevExt = pDevobj->DeviceExtension;
@@ -244,7 +244,7 @@ ControlFilterThread(PVOID pContext)
244244
QCFLT_DbgPrint
245245
(
246246
DBG_LEVEL_CRITICAL,
247-
("<%s> ControlFilterThread: wrong IRQL\n", pDevExt->PortName)
247+
("<%s> QCFLT_ControlFilterThread: wrong IRQL\n", pDevExt->PortName)
248248
);
249249
}
250250

@@ -260,7 +260,7 @@ ControlFilterThread(PVOID pContext)
260260
QCFLT_DbgPrint
261261
(
262262
DBG_LEVEL_CRITICAL,
263-
("<%s> ControlFilterThread: STATUS_NO_MEMORY 1\n", pDevExt->PortName)
263+
("<%s> QCFLT_ControlFilterThread: STATUS_NO_MEMORY 1\n", pDevExt->PortName)
264264
);
265265
_closeHandle(pDevExt->FilterThread.hFilterThreadHandle, "D-1");
266266
PsTerminateSystemThread(STATUS_NO_MEMORY);
@@ -484,7 +484,7 @@ ControlFilterThread(PVOID pContext)
484484
*
485485
****************************************************************************/
486486
NTSTATUS
487-
QCFilter_StartFilterThread(PDEVICE_OBJECT devObj)
487+
QCFLT_StartFilterThread(PDEVICE_OBJECT devObj)
488488
{
489489
PDEVICE_EXTENSION pDevExt = devObj->DeviceExtension;
490490
NTSTATUS ntStatus = STATUS_SUCCESS;
@@ -548,7 +548,7 @@ QCFilter_StartFilterThread(PDEVICE_OBJECT devObj)
548548
IN & objAttr, // POBJECT_ATTRIBUTES ObjectAttributes
549549
IN NULL, // HANDLE ProcessHandle
550550
OUT NULL, // PCLIENT_ID ClientId
551-
IN(PKSTART_ROUTINE)ControlFilterThread,
551+
IN (PKSTART_ROUTINE)QCFLT_ControlFilterThread,
552552
IN(PVOID)devObj
553553
);
554554
if (ntStatus != STATUS_SUCCESS)

‎src/windows/ndis/MPINI.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ NDIS_STATUS MPINI_MiniportInitialize
428428

429429
// KeClearEvent(&pAdapter->ControlReadPostedEvent);
430430

431-
MPWork_ScheduleWorkItem(pAdapter);
431+
MPMAIN_ScheduleWorkItem( pAdapter );
432432

433433
#ifdef QCMP_DISABLE_QMI
434434
if (pAdapter->DisableQMI == 0)
@@ -886,7 +886,7 @@ NDIS_STATUS MPINI_MiniportInitializeEx
886886
LinkState.PauseFunctions = NdisPauseFunctionsUnknown;
887887
LinkState.XmitLinkSpeed = NDIS_LINK_SPEED_UNKNOWN;
888888
LinkState.RcvLinkSpeed = NDIS_LINK_SPEED_UNKNOWN;
889-
MyNdisMIndicateStatus
889+
MPMAIN_NdisMIndicateStatus
890890
(
891891
pAdapter->AdapterHandle,
892892
NDIS_STATUS_LINK_STATE,
@@ -896,7 +896,7 @@ NDIS_STATUS MPINI_MiniportInitializeEx
896896
}
897897
#else
898898

899-
MyNdisMIndicateStatus
899+
MPMAIN_NdisMIndicateStatus
900900
(
901901
pAdapter->AdapterHandle,
902902
NDIS_STATUS_MEDIA_DISCONNECT,
@@ -908,7 +908,7 @@ NDIS_STATUS MPINI_MiniportInitializeEx
908908

909909
KeClearEvent(&pAdapter->ControlReadPostedEvent);
910910

911-
MPWork_ScheduleWorkItem(pAdapter);
911+
MPMAIN_ScheduleWorkItem( pAdapter );
912912

913913
#ifdef QCMP_DISABLE_QMI
914914
if (pAdapter->DisableQMI == 0)
@@ -1121,22 +1121,22 @@ NDIS_STATUS MPINI_AllocAdapter(PMP_ADAPTER *pAdapter)
11211121
NdisInitializeTimer
11221122
(
11231123
&Adapter->ResetTimer,
1124-
(PNDIS_TIMER_FUNCTION)ResetCompleteTimerDpc,
1124+
(PNDIS_TIMER_FUNCTION)MPMAIN_ResetCompleteTimerDpc,
11251125
(PVOID)Adapter
11261126
);
11271127

11281128
NdisInitializeTimer
11291129
(
11301130
&Adapter->ReconfigTimer,
1131-
(PNDIS_TIMER_FUNCTION)ReconfigTimerDpc,
1131+
(PNDIS_TIMER_FUNCTION)MPMAIN_ReconfigTimerDpc,
11321132
(PVOID)Adapter
11331133
);
11341134
Adapter->ReconfigTimerState = RECONF_TIMER_IDLE;
11351135

11361136
NdisInitializeTimer
11371137
(
11381138
&Adapter->ReconfigTimerIPv6,
1139-
(PNDIS_TIMER_FUNCTION)ReconfigTimerDpcIPv6,
1139+
(PNDIS_TIMER_FUNCTION)MPMAIN_ReconfigTimerDpcIPv6,
11401140
(PVOID)Adapter
11411141
);
11421142
Adapter->ReconfigTimerStateIPv6 = RECONF_TIMER_IDLE;
@@ -1145,28 +1145,28 @@ NDIS_STATUS MPINI_AllocAdapter(PMP_ADAPTER *pAdapter)
11451145
NdisInitializeTimer
11461146
(
11471147
&Adapter->SignalStateTimer,
1148-
(PNDIS_TIMER_FUNCTION)SignalStateTimerDpc,
1148+
(PNDIS_TIMER_FUNCTION)MPMAIN_SignalStateTimerDpc,
11491149
(PVOID)Adapter
11501150
);
11511151

11521152
NdisInitializeTimer
11531153
(
11541154
&Adapter->MsisdnTimer,
1155-
(PNDIS_TIMER_FUNCTION)MsisdnTimerDpc,
1155+
(PNDIS_TIMER_FUNCTION)MPMAIN_MsisdnTimerDpc,
11561156
(PVOID)Adapter
11571157
);
11581158

11591159
NdisInitializeTimer
11601160
(
11611161
&Adapter->RegisterPacketTimer,
1162-
(PNDIS_TIMER_FUNCTION)RegisterPacketTimerDpc,
1162+
(PNDIS_TIMER_FUNCTION)MPMAIN_RegisterPacketTimerDpc,
11631163
(PVOID)Adapter
11641164
);
11651165

11661166
NdisInitializeTimer
11671167
(
11681168
&Adapter->SignalStateDisconnectTimer,
1169-
(PNDIS_TIMER_FUNCTION)SignalStateDisconnectTimerDpc,
1169+
(PNDIS_TIMER_FUNCTION)MPMAIN_SignalStateDisconnectTimerDpc,
11701170
(PVOID)Adapter
11711171
);
11721172

‎src/windows/ndis/MPIP.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ NTSTATUS MPIP_StartWdsIpClient(PMP_ADAPTER pAdapter)
3232
NTSTATUS ntStatus;
3333
OBJECT_ATTRIBUTES objAttr;
3434

35-
if (QCMAIN_IsDualIPSupported(pAdapter) == FALSE)
35+
if (MPMAIN_IsDualIPSupported(pAdapter) == FALSE)
3636
{
3737
QCNET_DbgPrint
3838
(
@@ -331,7 +331,7 @@ VOID MPIP_WdsIpThread(PVOID Context)
331331
MPQMUX_SetQMUXBindMuxDataPort(pAdapter, pIocDev, QMUX_TYPE_WDS, QMIWDS_BIND_MUX_DATA_PORT_REQ);
332332

333333
// set IPV6
334-
if ((QCMAIN_IsDualIPSupported(pAdapter) == TRUE) && (pAdapter->WdsIpClientContext != NULL))
334+
if ((MPMAIN_IsDualIPSupported(pAdapter) == TRUE) && (pAdapter->WdsIpClientContext != NULL))
335335
{
336336
MPQMUX_ComposeQMUXReq(pAdapter, NULL, QMUX_TYPE_WDS,
337337
QMIWDS_SET_CLIENT_IP_FAMILY_PREF_REQ, (CUSTOMQMUX)MPQMUX_SetIPv6ClientIPFamilyPref, TRUE);
@@ -775,7 +775,7 @@ VOID ProcessWdsPktSrvcStatusInd(PMPIOC_DEV_INFO IocDevice, PQMUX_MSG Message)
775775
ContextState.ContextState.ConnectionId = pAdapter->WWanServiceConnectHandle;
776776
ContextState.ContextState.ActivationState = WwanActivationStateDeactivated;
777777

778-
MyNdisMIndicateStatus
778+
MPMAIN_NdisMIndicateStatus
779779
(
780780
pAdapter->AdapterHandle,
781781
NDIS_STATUS_WWAN_CONTEXT_STATE,

0 commit comments

Comments
 (0)