Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better handling of errors/special cases

Browse source 
svn path=/trunk/; revision=22095
This commit is contained in:
Hervé Poussineau 2006-05-28 21:43:45 +00:00
parent 10052376c0
commit 57ae379676
4 changed files with 71 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

19
reactos/drivers/base/green/dispatch.c
View file

@ -76,8 +76,27 @@ GreenDispatch(
{ {
DPRINT1("Unknown combination: MajorFunction 0x%lx, DeviceType %d\n", DPRINT1("Unknown combination: MajorFunction 0x%lx, DeviceType %d\n",
MajorFunction, DeviceType); MajorFunction, DeviceType);
switch (DeviceType)
{
case KeyboardFDO:
case ScreenFDO:
{
IoSkipCurrentIrpStackLocation(Irp);
return IoCallDriver(((PCOMMON_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice, Irp);
}
case GreenFDO:
{
PDRIVER_OBJECT DriverObject;
PGREEN_DRIVER_EXTENSION DriverExtension;
DriverObject = DeviceObject->DriverObject;
DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject);
IoSkipCurrentIrpStackLocation(Irp);
return IoCallDriver(DriverExtension->LowerDevice, Irp);
}
default:
ASSERT(FALSE); ASSERT(FALSE);
} }
}
Irp->IoStatus.Information = Information; Irp->IoStatus.Information = Information;
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;

1
reactos/drivers/base/green/green.h
View file

@ -105,6 +105,7 @@ typedef struct _GREEN_DRIVER_EXTENSION
ULONG SampleRate; ULONG SampleRate;
PDEVICE_OBJECT GreenMainDO; PDEVICE_OBJECT GreenMainDO;
PDEVICE_OBJECT LowerDevice;
} GREEN_DRIVER_EXTENSION, *PGREEN_DRIVER_EXTENSION; } GREEN_DRIVER_EXTENSION, *PGREEN_DRIVER_EXTENSION;
/************************************ createclose.c */ /************************************ createclose.c */

4
reactos/drivers/base/green/green.inf
View file

@ -38,9 +38,9 @@ ServiceType = 1
StartType = 1 StartType = 1
ErrorControl = 0 ErrorControl = 0
ServiceBinary = %12%\green.sys ServiceBinary = %12%\green.sys
LoadOrderGroup = Video Init LoadOrderGroup = Extended base
Description = %GREEN.DriverDesc% Description = %GREEN.DriverDesc%
Dependencies = blue Dependencies = blue, serial
[Green_AddReg.NT] [Green_AddReg.NT]
HKLM,"SYSTEM\CurrentControlSet\Services\green\Parameters","AttachedDevice",0x00000000,"\Device\Serial1" HKLM,"SYSTEM\CurrentControlSet\Services\green\Parameters","AttachedDevice",0x00000000,"\Device\Serial1"

21
reactos/drivers/base/green/pnp.c
View file

@ -26,7 +26,8 @@ CreateGreenFdo(
DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject);
Status = IoCreateDevice(DriverObject, Status = IoCreateDevice(
DriverObject,
sizeof(GREEN_DEVICE_EXTENSION), sizeof(GREEN_DEVICE_EXTENSION),
NULL, NULL,
FILE_DEVICE_TERMSRV, FILE_DEVICE_TERMSRV,
@ -43,7 +44,7 @@ CreateGreenFdo(
RtlZeroMemory(DeviceExtension, sizeof(GREEN_DEVICE_EXTENSION)); RtlZeroMemory(DeviceExtension, sizeof(GREEN_DEVICE_EXTENSION));
DeviceExtension->Common.Type = GreenFDO; DeviceExtension->Common.Type = GreenFDO;
DriverExtension->GreenMainDO->Flags |= DO_POWER_PAGABLE; DriverExtension->GreenMainDO->Flags |= DO_POWER_PAGABLE;
IoAttachDeviceToDeviceStack(DriverExtension->GreenMainDO, GreenPdo); DriverExtension->LowerDevice = IoAttachDeviceToDeviceStack(DriverExtension->GreenMainDO, GreenPdo);
/* Initialize serial port */ /* Initialize serial port */
InitializeObjectAttributes(&ObjectAttributes, &DriverExtension->AttachedDeviceName, OBJ_KERNEL_HANDLE, NULL, NULL); InitializeObjectAttributes(&ObjectAttributes, &DriverExtension->AttachedDeviceName, OBJ_KERNEL_HANDLE, NULL, NULL);
@ -119,12 +120,20 @@ cleanup:
{ {
if (DeviceExtension && DeviceExtension->Serial) if (DeviceExtension && DeviceExtension->Serial)
ObDereferenceObject(DeviceExtension->Serial); ObDereferenceObject(DeviceExtension->Serial);
if (DriverExtension && DriverExtension->GreenMainDO) if (DriverExtension)
{
if (DriverExtension->LowerDevice)
{
IoDetachDevice(DriverExtension->LowerDevice);
DriverExtension->LowerDevice = NULL;
}
if (DriverExtension->GreenMainDO)
{ {
IoDeleteDevice(DriverExtension->GreenMainDO); IoDeleteDevice(DriverExtension->GreenMainDO);
DriverExtension->GreenMainDO = NULL; DriverExtension->GreenMainDO = NULL;
} }
} }
}
return Status; return Status;
} }
@ -219,6 +228,8 @@ GreenQueryBusRelations(
DeviceExtension = (PGREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PGREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
/* Create PDOs for keyboard and screen */ /* Create PDOs for keyboard and screen */
if (DeviceExtension->KeyboardPdo == NULL)
{
Status = IoCreateDevice( Status = IoCreateDevice(
DeviceObject->DriverObject, DeviceObject->DriverObject,
sizeof(COMMON_DEVICE_EXTENSION), sizeof(COMMON_DEVICE_EXTENSION),
@ -235,7 +246,10 @@ GreenQueryBusRelations(
((PCOMMON_DEVICE_EXTENSION)DeviceExtension->KeyboardPdo->DeviceExtension)->Type = KeyboardPDO; ((PCOMMON_DEVICE_EXTENSION)DeviceExtension->KeyboardPdo->DeviceExtension)->Type = KeyboardPDO;
DeviceExtension->KeyboardPdo->Flags |= DO_POWER_PAGABLE | DO_BUS_ENUMERATED_DEVICE; DeviceExtension->KeyboardPdo->Flags |= DO_POWER_PAGABLE | DO_BUS_ENUMERATED_DEVICE;
DeviceExtension->KeyboardPdo->Flags &= ~DO_DEVICE_INITIALIZING; DeviceExtension->KeyboardPdo->Flags &= ~DO_DEVICE_INITIALIZING;
}
if (DeviceExtension->ScreenPdo == NULL)
{
Status = IoCreateDevice( Status = IoCreateDevice(
DeviceObject->DriverObject, DeviceObject->DriverObject,
sizeof(COMMON_DEVICE_EXTENSION), sizeof(COMMON_DEVICE_EXTENSION),
@ -252,6 +266,7 @@ GreenQueryBusRelations(
((PCOMMON_DEVICE_EXTENSION)DeviceExtension->ScreenPdo->DeviceExtension)->Type = ScreenPDO; ((PCOMMON_DEVICE_EXTENSION)DeviceExtension->ScreenPdo->DeviceExtension)->Type = ScreenPDO;
DeviceExtension->ScreenPdo->Flags |= DO_POWER_PAGABLE | DO_BUS_ENUMERATED_DEVICE; DeviceExtension->ScreenPdo->Flags |= DO_POWER_PAGABLE | DO_BUS_ENUMERATED_DEVICE;
DeviceExtension->ScreenPdo->Flags &= ~DO_DEVICE_INITIALIZING; DeviceExtension->ScreenPdo->Flags &= ~DO_DEVICE_INITIALIZING;
}
/* Allocate return structure */ /* Allocate return structure */
DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool( DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(