win-pvdrivers

changeset 66:be0e5f13ec5f

Fixed a merge problem. Appears to be working now.
author James Harper <james.harper@bendigoit.com.au>
date Wed Dec 19 20:27:40 2007 +1100 (2007-12-19)
parents d458fc4371b9
children 6de0f54b913c
files xenvbd/sources xenvbd/xenvbd.c
line diff
     1.1 --- a/xenvbd/sources	Wed Dec 19 14:27:43 2007 +1100
     1.2 +++ b/xenvbd/sources	Wed Dec 19 20:27:40 2007 +1100
     1.3 @@ -1,7 +1,7 @@
     1.4  TARGETNAME=XENVBD
     1.5  TARGETTYPE=DRIVER
     1.6  TARGETPATH=..\Target\$(DDK_TARGET_OS)
     1.7 -VERSION=0.4.0.124
     1.8 +VERSION=0.4.0.125
     1.9  KMDF_VERSION=1
    1.10  MSC_WARNING_LEVEL=/W4
    1.11  INF_NAME=xenvbd
     2.1 --- a/xenvbd/xenvbd.c	Wed Dec 19 14:27:43 2007 +1100
     2.2 +++ b/xenvbd/xenvbd.c	Wed Dec 19 20:27:40 2007 +1100
     2.3 @@ -29,9 +29,6 @@ XenVbd_HwScsiAdapterState(PVOID DeviceEx
     2.4  static SCSI_ADAPTER_CONTROL_STATUS
     2.5  XenVbd_HwScsiAdapterControl(PVOID DeviceExtension, SCSI_ADAPTER_CONTROL_TYPE ControlType, PVOID Parameters);
     2.6  
     2.7 -//static XEN_IFACE_EVTCHN EvtChnInterface;
     2.8 -//static XEN_IFACE_XENBUS XenBusInterface;
     2.9 -
    2.10  #ifdef ALLOC_PRAGMA
    2.11  #pragma alloc_text (INIT, DriverEntry)
    2.12  #endif
    2.13 @@ -382,15 +379,15 @@ XenVbd_BackEndStateHandler(char *Path, P
    2.14  
    2.15      RtlStringCbCopyA(TmpPath, 128, TargetData->Path);
    2.16      RtlStringCbCatA(TmpPath, 128, "/ring-ref");
    2.17 -    DeviceData->XenDeviceData->XenBusInterface.Printf(XBT_NIL, TmpPath, "%d", ref);
    2.18 +    DeviceData->XenDeviceData->XenBusInterface.Printf(DeviceData->XenDeviceData->XenBusInterface.InterfaceHeader.Context, XBT_NIL, TmpPath, "%d", ref);
    2.19  
    2.20      RtlStringCbCopyA(TmpPath, 128, TargetData->Path);
    2.21      RtlStringCbCatA(TmpPath, 128, "/event-channel");
    2.22 -    DeviceData->XenDeviceData->XenBusInterface.Printf(XBT_NIL, TmpPath, "%d", TargetData->EventChannel);
    2.23 +    DeviceData->XenDeviceData->XenBusInterface.Printf(DeviceData->XenDeviceData->XenBusInterface.InterfaceHeader.Context, XBT_NIL, TmpPath, "%d", TargetData->EventChannel);
    2.24    
    2.25      RtlStringCbCopyA(TmpPath, 128, TargetData->Path);
    2.26      RtlStringCbCatA(TmpPath, 128, "/state");
    2.27 -    DeviceData->XenDeviceData->XenBusInterface.Printf(XBT_NIL, TmpPath, "%d", XenbusStateInitialised);
    2.28 +    DeviceData->XenDeviceData->XenBusInterface.Printf(DeviceData->XenDeviceData->XenBusInterface.InterfaceHeader.Context, XBT_NIL, TmpPath, "%d", XenbusStateInitialised);
    2.29  
    2.30      KdPrint((__DRIVER_NAME "     Set Frontend state to Initialised\n"));
    2.31      break;
    2.32 @@ -472,7 +469,7 @@ XenVbd_BackEndStateHandler(char *Path, P
    2.33  
    2.34      RtlStringCbCopyA(TmpPath, 128, TargetData->Path);
    2.35      RtlStringCbCatA(TmpPath, 128, "/state");
    2.36 -    DeviceData->XenDeviceData->XenBusInterface.Printf(XBT_NIL, TmpPath, "%d", XenbusStateConnected);
    2.37 +    DeviceData->XenDeviceData->XenBusInterface.Printf(DeviceData->XenDeviceData->XenBusInterface.InterfaceHeader.Context, XBT_NIL, TmpPath, "%d", XenbusStateConnected);
    2.38  
    2.39      KdPrint((__DRIVER_NAME "     Set Frontend state to Connected\n"));
    2.40      InterlockedIncrement(&DeviceData->EnumeratedDevices);