Skip to content

Mainline code with QUD legacy repo #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rohimish-qc merged 1 commit into from
Mar 10, 2026
Merged

Mainline code with QUD legacy repo #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions src/windows/filter/qcfilter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ QCFilterAddDevice(

QCFLT_DbgPrint(DBG_LEVEL_DETAIL, ("QCFilterAddDevice : Initialize RemoveLock\n"));
IoInitializeRemoveLock(&QCdevExt->RemoveLock, POOL_TAG, 1, 100);
NTstatus = QCFilter_InitializeDeviceExt(QCdeviceObject);
NTstatus = QCFLT_InitializeDeviceExt( QCdeviceObject );
if (NTstatus != STATUS_SUCCESS)
{
IoDeleteDevice(QCdeviceObject);
return STATUS_UNSUCCESSFUL;
}
NTstatus = QCFilter_StartFilterThread(QCdeviceObject);
NTstatus = QCFLT_StartFilterThread( QCdeviceObject );
if (NTstatus != STATUS_SUCCESS)
{
IoDeleteDevice(QCdeviceObject);
Expand Down Expand Up @@ -668,6 +668,7 @@ QCFilterUnload(PDRIVER_OBJECT DriverObject)
#ifdef EVENT_TRACING
WPP_CLEANUP(DriverObject);
#endif
return;
}

/****************************************************************************
Expand Down Expand Up @@ -862,7 +863,7 @@ QCFilterDeleteControlObject(PDEVICE_OBJECT DeviceObject, PFILTER_DEVICE_INFO
* returns: void
*
****************************************************************************/
VOID DispatchCancelQueued(PDEVICE_OBJECT DeviceObject, PIRP Irp)
VOID QCFLT_DispatchCancelQueued(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{
KIRQL irql = KeGetCurrentIrql();
PDEVICE_EXTENSION pDevExt = DeviceObject->DeviceExtension;
Expand Down Expand Up @@ -900,7 +901,7 @@ VOID DispatchCancelQueued(PDEVICE_OBJECT DeviceObject, PIRP Irp)
DBG_LEVEL_ERROR,
("<%s> DSP_Cxl: no action to active 0x%p\n", pDevExt->PortName, Irp)
);
IoSetCancelRoutine(Irp, DispatchCancelQueued);
IoSetCancelRoutine(Irp, QCFLT_DispatchCancelQueued);
}

QcReleaseSpinLock(&pDevExt->FilterSpinLock, levelOrHandle);
Expand Down Expand Up @@ -1348,7 +1349,7 @@ NTSTATUS QCFLT_GetStringDescriptor
* returns: STATUS_MORE_PROCESSING_REQUIRED
*
****************************************************************************/
NTSTATUS GetConfigurationCompletion(PDEVICE_OBJECT pDevObj, PIRP pIrp, PVOID pEvent)
NTSTATUS QCFLT_GetConfigurationCompletion(PDEVICE_OBJECT pDevObj, PIRP pIrp, PVOID pEvent)
{

KeSetEvent((PKEVENT)pEvent, IO_NO_INCREMENT, FALSE);
Expand Down Expand Up @@ -1461,7 +1462,7 @@ QCFilterDispatchIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
}

_IoMarkIrpPending(Irp);
IoSetCancelRoutine(Irp, DispatchCancelQueued);
IoSetCancelRoutine(Irp, QCFLT_DispatchCancelQueued);

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

_IoMarkIrpPending(Irp);
IoSetCancelRoutine(Irp, DispatchCancelQueued);
IoSetCancelRoutine(Irp, QCFLT_DispatchCancelQueued);

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

IoSetCompletionRoutine(Irp,
(PIO_COMPLETION_ROUTINE)GetConfigurationCompletion,
(PIO_COMPLETION_ROUTINE) QCFLT_GetConfigurationCompletion,
&event, TRUE, TRUE, TRUE);

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

IoSetCompletionRoutine(Irp,
(PIO_COMPLETION_ROUTINE)GetConfigurationCompletion,
(PIO_COMPLETION_ROUTINE) QCFLT_GetConfigurationCompletion,
&event, TRUE, TRUE, TRUE);

status = IoCallDriver(deviceExtension->NextLowerDriver, Irp);
Expand Down Expand Up @@ -1853,7 +1854,7 @@ QCFilterDispatchIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
IoCopyCurrentIrpStackLocationToNext(Irp);

IoSetCompletionRoutine(Irp,
(PIO_COMPLETION_ROUTINE)GetConfigurationCompletion,
(PIO_COMPLETION_ROUTINE) QCFLT_GetConfigurationCompletion,
&event, TRUE, TRUE, TRUE);

status = IoCallDriver(deviceExtension->NextLowerDriver, Irp);
Expand Down Expand Up @@ -2259,7 +2260,7 @@ VOID QCFLT_Wait(PDEVICE_EXTENSION pDevExt, LONGLONG WaitTime)
*
*********************************************************************/
NTSTATUS
QCFilter_InitializeDeviceExt(PDEVICE_OBJECT deviceObject)
QCFLT_InitializeDeviceExt( PDEVICE_OBJECT deviceObject )
{
PDEVICE_EXTENSION pDevExt = deviceObject->DeviceExtension;
NTSTATUS ntStatus = STATUS_SUCCESS;
Expand Down Expand Up @@ -2984,14 +2985,14 @@ NTSTATUS getRegDwValueEntryData
NTSTATUS ntStatus = STATUS_SUCCESS;
PKEY_VALUE_FULL_INFORMATION pKeyValueInfo = NULL;

ntStatus = GetValueEntry(OpenRegKey, ValueEntryName, &pKeyValueInfo);
ntStatus = QCFLT_GetValueEntry( OpenRegKey, ValueEntryName, &pKeyValueInfo );

if (!NT_SUCCESS(ntStatus))
{
goto getRegDwValueEntryData_Return;
}

*pValueEntryData = GetDwordField(pKeyValueInfo);
*pValueEntryData = QCFLT_GetDwordField( pKeyValueInfo );

getRegDwValueEntryData_Return:

Expand Down Expand Up @@ -3023,14 +3024,14 @@ NTSTATUS getRegSzValueEntryData
NTSTATUS ntStatus = STATUS_SUCCESS;
PKEY_VALUE_FULL_INFORMATION pKeyValueInfo = NULL;

ntStatus = GetValueEntry(OpenRegKey, ValueEntryName, &pKeyValueInfo);
ntStatus = QCFLT_GetValueEntry( OpenRegKey, ValueEntryName, &pKeyValueInfo );

if (!NT_SUCCESS(ntStatus))
{
goto getRegSzValueEntryData_Return;
}

GetSzField(pKeyValueInfo, pValueEntryData);
QCFLT_GetSzField( pKeyValueInfo, pValueEntryData);

getRegSzValueEntryData_Return:

Expand All @@ -3056,7 +3057,7 @@ Routine Description:
NT Status

************************************************************************/
NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo)
NTSTATUS QCFLT_GetValueEntry( HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo )
{
PKEY_VALUE_FULL_INFORMATION pKeyValueInfo = NULL;
UNICODE_STRING Keyname;
Expand All @@ -3081,7 +3082,7 @@ NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION
{
*pKeyValInfo = NULL;
ntStatus = STATUS_NO_MEMORY;
goto GetValueEntry_Return;
goto QCFLT_GetValueEntry_Return;
}

ntStatus = ZwQueryValueKey(
Expand Down Expand Up @@ -3115,7 +3116,7 @@ NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION
}
}// while

GetValueEntry_Return:
QCFLT_GetValueEntry_Return:

return ntStatus;

Expand All @@ -3132,7 +3133,7 @@ Routine Description:
ULONG value of the value entry

************************************************************************/
ULONG GetDwordField(PKEY_VALUE_FULL_INFORMATION pKvi)
ULONG QCFLT_GetDwordField( PKEY_VALUE_FULL_INFORMATION pKvi )
{
ULONG dwVal, *pVal;

Expand All @@ -3152,7 +3153,7 @@ Routine Description:
Sz value of the value entry

************************************************************************/
VOID GetSzField(PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz)
VOID QCFLT_GetSzField( PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz )
{
UNICODE_STRING unicodeStr;
ANSI_STRING ansiStr;
Expand Down
10 changes: 5 additions & 5 deletions src/windows/filter/qcfilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,13 @@ QCFilterCreateControlObject(PDEVICE_OBJECT DeviceObject, PFILTER_DEVICE_INFO pFi
NTSTATUS
QCFilterDeleteControlObject(PDEVICE_OBJECT DeviceObject, PFILTER_DEVICE_INFO pFilterDeviceInfo);

NTSTATUS QCFilter_StartFilterThread(PDEVICE_OBJECT devObj);
NTSTATUS QCFLT_StartFilterThread(PDEVICE_OBJECT devObj);

VOID QCFilter_CancelFilterThread(PDEVICE_OBJECT pDevObj);

VOID QCFLT_Wait(PDEVICE_EXTENSION pDevExt, LONGLONG WaitTime);

NTSTATUS QCFilter_InitializeDeviceExt(PDEVICE_OBJECT deviceObject);
NTSTATUS QCFLT_InitializeDeviceExt( PDEVICE_OBJECT deviceObject );

BOOLEAN QCFLT_IsIrpInQueue
(
Expand Down Expand Up @@ -455,11 +455,11 @@ NTSTATUS getRegSzValueEntryData
OUT PCHAR pValueEntryData
);

NTSTATUS GetValueEntry(HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo);
NTSTATUS QCFLT_GetValueEntry( HANDLE hKey, PWSTR FieldName, PKEY_VALUE_FULL_INFORMATION *pKeyValInfo );

ULONG GetDwordField(PKEY_VALUE_FULL_INFORMATION pKvi);
ULONG QCFLT_GetDwordField( PKEY_VALUE_FULL_INFORMATION pKvi );

VOID GetSzField(PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz);
VOID QCFLT_GetSzField(PKEY_VALUE_FULL_INFORMATION pKvi, PCHAR ValueEntryDataSz);

BOOLEAN USBPNP_ValidateConfigDescriptor
(
Expand Down
10 changes: 5 additions & 5 deletions src/windows/filter/qcfilterioc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ ProcessDispatchIrp
*
****************************************************************************/
VOID
ControlFilterThread(PVOID pContext)
QCFLT_ControlFilterThread(PVOID pContext)
{
PDEVICE_OBJECT pDevobj = (PDEVICE_OBJECT)pContext;
PDEVICE_EXTENSION pDevExt = pDevobj->DeviceExtension;
Expand All @@ -244,7 +244,7 @@ ControlFilterThread(PVOID pContext)
QCFLT_DbgPrint
(
DBG_LEVEL_CRITICAL,
("<%s> ControlFilterThread: wrong IRQL\n", pDevExt->PortName)
("<%s> QCFLT_ControlFilterThread: wrong IRQL\n", pDevExt->PortName)
);
}

Expand All @@ -260,7 +260,7 @@ ControlFilterThread(PVOID pContext)
QCFLT_DbgPrint
(
DBG_LEVEL_CRITICAL,
("<%s> ControlFilterThread: STATUS_NO_MEMORY 1\n", pDevExt->PortName)
("<%s> QCFLT_ControlFilterThread: STATUS_NO_MEMORY 1\n", pDevExt->PortName)
);
_closeHandle(pDevExt->FilterThread.hFilterThreadHandle, "D-1");
PsTerminateSystemThread(STATUS_NO_MEMORY);
Expand Down Expand Up @@ -484,7 +484,7 @@ ControlFilterThread(PVOID pContext)
*
****************************************************************************/
NTSTATUS
QCFilter_StartFilterThread(PDEVICE_OBJECT devObj)
QCFLT_StartFilterThread(PDEVICE_OBJECT devObj)
{
PDEVICE_EXTENSION pDevExt = devObj->DeviceExtension;
NTSTATUS ntStatus = STATUS_SUCCESS;
Expand Down Expand Up @@ -548,7 +548,7 @@ QCFilter_StartFilterThread(PDEVICE_OBJECT devObj)
IN & objAttr, // POBJECT_ATTRIBUTES ObjectAttributes
IN NULL, // HANDLE ProcessHandle
OUT NULL, // PCLIENT_ID ClientId
IN(PKSTART_ROUTINE)ControlFilterThread,
IN (PKSTART_ROUTINE)QCFLT_ControlFilterThread,
IN(PVOID)devObj
);
if (ntStatus != STATUS_SUCCESS)
Expand Down
22 changes: 11 additions & 11 deletions src/windows/ndis/MPINI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ NDIS_STATUS MPINI_MiniportInitialize

// KeClearEvent(&pAdapter->ControlReadPostedEvent);

MPWork_ScheduleWorkItem(pAdapter);
MPMAIN_ScheduleWorkItem( pAdapter );

#ifdef QCMP_DISABLE_QMI
if (pAdapter->DisableQMI == 0)
Expand Down Expand Up @@ -886,7 +886,7 @@ NDIS_STATUS MPINI_MiniportInitializeEx
LinkState.PauseFunctions = NdisPauseFunctionsUnknown;
LinkState.XmitLinkSpeed = NDIS_LINK_SPEED_UNKNOWN;
LinkState.RcvLinkSpeed = NDIS_LINK_SPEED_UNKNOWN;
MyNdisMIndicateStatus
MPMAIN_NdisMIndicateStatus
(
pAdapter->AdapterHandle,
NDIS_STATUS_LINK_STATE,
Expand All @@ -896,7 +896,7 @@ NDIS_STATUS MPINI_MiniportInitializeEx
}
#else

MyNdisMIndicateStatus
MPMAIN_NdisMIndicateStatus
(
pAdapter->AdapterHandle,
NDIS_STATUS_MEDIA_DISCONNECT,
Expand All @@ -908,7 +908,7 @@ NDIS_STATUS MPINI_MiniportInitializeEx

KeClearEvent(&pAdapter->ControlReadPostedEvent);

MPWork_ScheduleWorkItem(pAdapter);
MPMAIN_ScheduleWorkItem( pAdapter );

#ifdef QCMP_DISABLE_QMI
if (pAdapter->DisableQMI == 0)
Expand Down Expand Up @@ -1121,22 +1121,22 @@ NDIS_STATUS MPINI_AllocAdapter(PMP_ADAPTER *pAdapter)
NdisInitializeTimer
(
&Adapter->ResetTimer,
(PNDIS_TIMER_FUNCTION)ResetCompleteTimerDpc,
(PNDIS_TIMER_FUNCTION)MPMAIN_ResetCompleteTimerDpc,
(PVOID)Adapter
);

NdisInitializeTimer
(
&Adapter->ReconfigTimer,
(PNDIS_TIMER_FUNCTION)ReconfigTimerDpc,
(PNDIS_TIMER_FUNCTION)MPMAIN_ReconfigTimerDpc,
(PVOID)Adapter
);
Adapter->ReconfigTimerState = RECONF_TIMER_IDLE;

NdisInitializeTimer
(
&Adapter->ReconfigTimerIPv6,
(PNDIS_TIMER_FUNCTION)ReconfigTimerDpcIPv6,
(PNDIS_TIMER_FUNCTION)MPMAIN_ReconfigTimerDpcIPv6,
(PVOID)Adapter
);
Adapter->ReconfigTimerStateIPv6 = RECONF_TIMER_IDLE;
Expand All @@ -1145,28 +1145,28 @@ NDIS_STATUS MPINI_AllocAdapter(PMP_ADAPTER *pAdapter)
NdisInitializeTimer
(
&Adapter->SignalStateTimer,
(PNDIS_TIMER_FUNCTION)SignalStateTimerDpc,
(PNDIS_TIMER_FUNCTION)MPMAIN_SignalStateTimerDpc,
(PVOID)Adapter
);

NdisInitializeTimer
(
&Adapter->MsisdnTimer,
(PNDIS_TIMER_FUNCTION)MsisdnTimerDpc,
(PNDIS_TIMER_FUNCTION)MPMAIN_MsisdnTimerDpc,
(PVOID)Adapter
);

NdisInitializeTimer
(
&Adapter->RegisterPacketTimer,
(PNDIS_TIMER_FUNCTION)RegisterPacketTimerDpc,
(PNDIS_TIMER_FUNCTION)MPMAIN_RegisterPacketTimerDpc,
(PVOID)Adapter
);

NdisInitializeTimer
(
&Adapter->SignalStateDisconnectTimer,
(PNDIS_TIMER_FUNCTION)SignalStateDisconnectTimerDpc,
(PNDIS_TIMER_FUNCTION)MPMAIN_SignalStateDisconnectTimerDpc,
(PVOID)Adapter
);

Expand Down
6 changes: 3 additions & 3 deletions src/windows/ndis/MPIP.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ NTSTATUS MPIP_StartWdsIpClient(PMP_ADAPTER pAdapter)
NTSTATUS ntStatus;
OBJECT_ATTRIBUTES objAttr;

if (QCMAIN_IsDualIPSupported(pAdapter) == FALSE)
if (MPMAIN_IsDualIPSupported(pAdapter) == FALSE)
{
QCNET_DbgPrint
(
Expand Down Expand Up @@ -331,7 +331,7 @@ VOID MPIP_WdsIpThread(PVOID Context)
MPQMUX_SetQMUXBindMuxDataPort(pAdapter, pIocDev, QMUX_TYPE_WDS, QMIWDS_BIND_MUX_DATA_PORT_REQ);

// set IPV6
if ((QCMAIN_IsDualIPSupported(pAdapter) == TRUE) && (pAdapter->WdsIpClientContext != NULL))
if ((MPMAIN_IsDualIPSupported(pAdapter) == TRUE) && (pAdapter->WdsIpClientContext != NULL))
{
MPQMUX_ComposeQMUXReq(pAdapter, NULL, QMUX_TYPE_WDS,
QMIWDS_SET_CLIENT_IP_FAMILY_PREF_REQ, (CUSTOMQMUX)MPQMUX_SetIPv6ClientIPFamilyPref, TRUE);
Expand Down Expand Up @@ -775,7 +775,7 @@ VOID ProcessWdsPktSrvcStatusInd(PMPIOC_DEV_INFO IocDevice, PQMUX_MSG Message)
ContextState.ContextState.ConnectionId = pAdapter->WWanServiceConnectHandle;
ContextState.ContextState.ActivationState = WwanActivationStateDeactivated;

MyNdisMIndicateStatus
MPMAIN_NdisMIndicateStatus
(
pAdapter->AdapterHandle,
NDIS_STATUS_WWAN_CONTEXT_STATE,
Expand Down
Loading
Loading