Commit in reactos/drivers/video/videoprt on videoprt_pnp_14032004
dispatch.c+4-111.1.2.9 -> 1.1.2.10
interrupt.c+3-81.1.2.3 -> 1.1.2.4
timer.c+3-81.1.2.3 -> 1.1.2.4
videoprt.c+3-31.21.2.5 -> 1.21.2.6
videoprt.h+9-81.6.2.4 -> 1.6.2.5
+22-38
5 modified files
- Minor optimalization.
- Removed useless code.
reactos/drivers/video/videoprt
dispatch.c 1.1.2.9 -> 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- dispatch.c	18 Mar 2004 21:28:21 -0000	1.1.2.9
+++ dispatch.c	19 Mar 2004 17:37:55 -0000	1.1.2.10
@@ -18,7 +18,7 @@

  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *

- * $Id: dispatch.c,v 1.1.2.9 2004/03/18 21:28:21 navaraf Exp $

+ * $Id: dispatch.c,v 1.1.2.10 2004/03/19 17:37:55 navaraf Exp $

  */
 
 #include "videoprt.h"

@@ -45,9 +45,7 @@

    if (ResetDisplayParametersDeviceExtension == NULL)
       return FALSE;
 

-   DriverExtension = IoGetDriverObjectExtension(
-      ResetDisplayParametersDeviceExtension->FunctionalDeviceObject->DriverObject,
-      ResetDisplayParametersDeviceExtension->FunctionalDeviceObject->DriverObject);

+   DriverExtension = ResetDisplayParametersDeviceExtension->DriverExtension;

 
    ASSERT(DriverExtension->InitializationData.HwResetHw != NULL);
 

@@ -125,10 +123,7 @@

    }
 
    DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension;

-
-   DriverExtension = IoGetDriverObjectExtension(
-      DeviceObject->DriverObject,
-      DeviceObject->DriverObject);

+   DriverExtension = DeviceExtension->DriverExtension;

 
    if (DriverExtension->InitializationData.HwInitialize(&DeviceExtension->MiniPortDeviceExtension))
    {

@@ -206,9 +201,7 @@

 
    IrpStack = IoGetCurrentIrpStackLocation(Irp);
    DeviceExtension = DeviceObject->DeviceExtension;

-   DriverExtension = IoGetDriverObjectExtension(
-      DeviceObject->DriverObject,
-      DeviceObject->DriverObject);

+   DriverExtension = DeviceExtension->DriverExtension;

 
    /* Translate the IRP to a VRP */
    vrp = ExAllocatePool(NonPagedPool, sizeof(VIDEO_REQUEST_PACKET));
reactos/drivers/video/videoprt
interrupt.c 1.1.2.3 -> 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- interrupt.c	18 Mar 2004 21:28:21 -0000	1.1.2.3
+++ interrupt.c	19 Mar 2004 17:37:55 -0000	1.1.2.4
@@ -18,7 +18,7 @@

  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *

- * $Id: interrupt.c,v 1.1.2.3 2004/03/18 21:28:21 navaraf Exp $

+ * $Id: interrupt.c,v 1.1.2.4 2004/03/19 17:37:55 navaraf Exp $

  */
 
 #include "videoprt.h"

@@ -31,15 +31,10 @@

    IN PVOID ServiceContext)
 {
    PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = ServiceContext;

-   PVIDEO_PORT_DRIVER_EXTENSION DriverExtension;

 

-   DriverExtension = IoGetDriverObjectExtension(
-      DeviceExtension->FunctionalDeviceObject->DriverObject,
-      DeviceExtension->FunctionalDeviceObject->DriverObject);
-  
-   ASSERT(DriverExtension->InitializationData.HwInterrupt != NULL);

+   ASSERT(DeviceExtension->DriverExtension->InitializationData.HwInterrupt != NULL);

 

-   return DriverExtension->InitializationData.HwInterrupt(

+   return DeviceExtension->DriverExtension->InitializationData.HwInterrupt(

       &DeviceExtension->MiniPortDeviceExtension);
 }
reactos/drivers/video/videoprt
timer.c 1.1.2.3 -> 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- timer.c	18 Mar 2004 21:28:21 -0000	1.1.2.3
+++ timer.c	19 Mar 2004 17:37:55 -0000	1.1.2.4
@@ -18,7 +18,7 @@

  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *

- * $Id: timer.c,v 1.1.2.3 2004/03/18 21:28:21 navaraf Exp $

+ * $Id: timer.c,v 1.1.2.4 2004/03/19 17:37:55 navaraf Exp $

  */
 
 #include "videoprt.h"

@@ -31,15 +31,10 @@

    IN PVOID ServiceContext)
 {
    PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = ServiceContext;

-   PVIDEO_PORT_DRIVER_EXTENSION DriverExtension;

 

-   DriverExtension = IoGetDriverObjectExtension(
-      DeviceObject->DriverObject,
-      DeviceObject->DriverObject);
-  
-   ASSERT(DriverExtension->InitializationData.HwTimer != NULL);

+   ASSERT(DeviceExtension->DriverExtension->InitializationData.HwTimer != NULL);

 

-   DriverExtension->InitializationData.HwTimer(

+   DeviceExtension->DriverExtension->InitializationData.HwTimer(

       &DeviceExtension->MiniPortDeviceExtension);
 }
reactos/drivers/video/videoprt
videoprt.c 1.21.2.5 -> 1.21.2.6
diff -u -r1.21.2.5 -r1.21.2.6
--- videoprt.c	18 Mar 2004 21:28:21 -0000	1.21.2.5
+++ videoprt.c	19 Mar 2004 17:37:55 -0000	1.21.2.6
@@ -18,7 +18,7 @@

  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *

- * $Id: videoprt.c,v 1.21.2.5 2004/03/18 21:28:21 navaraf Exp $

+ * $Id: videoprt.c,v 1.21.2.6 2004/03/19 17:37:55 navaraf Exp $

  */
 
 #include "videoprt.h"

@@ -233,8 +233,7 @@

    DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
    DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject;
    DeviceExtension->FunctionalDeviceObject = DeviceObject;

-   DeviceExtension->SystemIoBusNumber = ConfigInfo.SystemIoBusNumber;
-   DeviceExtension->AdapterInterfaceType = ConfigInfo.AdapterInterfaceType;

+   DeviceExtension->DriverExtension = DriverExtension;

 
    DeviceExtension->RegistryPath.Length = 
    DeviceExtension->RegistryPath.MaximumLength = 

@@ -315,6 +314,7 @@

       ConfigInfo.InterruptMode = Latched;
    ConfigInfo.DriverRegistryPath = DriverExtension->RegistryPath.Buffer;
    ConfigInfo.VideoPortGetProcAddress = IntVideoPortGetProcAddress;

+   ConfigInfo.SystemIoBusNumber = DeviceExtension->SystemIoBusNumber;

 
    Size = sizeof(SystemBasicInfo);
    Status = ZwQuerySystemInformation(
reactos/drivers/video/videoprt
videoprt.h 1.6.2.4 -> 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- videoprt.h	18 Mar 2004 21:28:21 -0000	1.6.2.4
+++ videoprt.h	19 Mar 2004 17:37:55 -0000	1.6.2.5
@@ -18,7 +18,7 @@

  * If not, write to the Free Software Foundation,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *

- * $Id: videoprt.h,v 1.6.2.4 2004/03/18 21:28:21 navaraf Exp $

+ * $Id: videoprt.h,v 1.6.2.5 2004/03/19 17:37:55 navaraf Exp $

  */
 
 #ifndef VIDEOPRT_H

@@ -50,6 +50,13 @@

    UINT MappingCount;
 } VIDEO_PORT_ADDRESS_MAPPING, *PVIDEO_PORT_ADDRESS_MAPPING;
 

+typedef struct _VIDEO_PORT_DRIVER_EXTENSION
+{
+   VIDEO_HW_INITIALIZATION_DATA InitializationData;
+   PVOID HwContext;
+   UNICODE_STRING RegistryPath;
+} VIDEO_PORT_DRIVER_EXTENSION, *PVIDEO_PORT_DRIVER_EXTENSION;
+

 typedef struct _VIDEO_PORT_DEVICE_EXTENSTION
 {
    PDEVICE_OBJECT PhysicalDeviceObject;

@@ -64,16 +71,10 @@

    ULONG SystemIoSlotNumber;
    LIST_ENTRY AddressMappingListHead;
    KDPC DpcObject;

+   VIDEO_PORT_DRIVER_EXTENSION *DriverExtension;

    CHAR MiniPortDeviceExtension[1];
 } VIDEO_PORT_DEVICE_EXTENSION, *PVIDEO_PORT_DEVICE_EXTENSION;
 

-typedef struct _VIDEO_PORT_DRIVER_EXTENSION
-{
-   VIDEO_HW_INITIALIZATION_DATA InitializationData;
-   PVOID HwContext;
-   UNICODE_STRING RegistryPath;
-} VIDEO_PORT_DRIVER_EXTENSION, *PVIDEO_PORT_DRIVER_EXTENSION;
-

 #define VIDEO_PORT_GET_DEVICE_EXTENSION(MiniportExtension) \
    CONTAINING_RECORD( \
       HwDeviceExtension, \
CVSspam 0.2.8