win-pvdrivers

changeset 384:3c8f2fa47a18

remove ^M pollution from w32api patch
author Andy Grover <andy.grover@oracle.com>
date Wed Jul 09 12:56:04 2008 -0700 (2008-07-09)
parents f038c7581cf4
children 193ef493dfcb
files mingw/w32api.diff
line diff
     1.1 --- a/mingw/w32api.diff	Wed Jul 09 12:37:49 2008 -0700
     1.2 +++ b/mingw/w32api.diff	Wed Jul 09 12:56:04 2008 -0700
     1.3 @@ -1,19 +1,19 @@
     1.4 -diff -r 79e257d5a1f7 include/ddk/ndis.h
     1.5 ---- a/include/ddk/ndis.h	Tue Jul 08 22:16:37 2008 -0700
     1.6 -+++ b/include/ddk/ndis.h	Wed Jul 09 12:36:49 2008 -0700
     1.7 +diff -r 8a2d0356d23d include/ddk/ndis.h
     1.8 +--- a/include/ddk/ndis.h	Wed Jul 09 12:54:30 2008 -0700
     1.9 ++++ b/include/ddk/ndis.h	Wed Jul 09 12:54:42 2008 -0700
    1.10  @@ -52,12 +52,16 @@ extern "C" {
    1.11   #if defined(NDIS50_MINIPORT)
    1.12   #ifndef NDIS50
    1.13   #define NDIS50
    1.14 -+#define NDIS_MINIPORT_MAJOR_VERSION 5
    1.15 -+#define NDIS_MINIPORT_MINOR_VERSION 0
    1.16 ++#define NDIS_MINIPORT_MAJOR_VERSION 5
    1.17 ++#define NDIS_MINIPORT_MINOR_VERSION 0
    1.18   #endif
    1.19   #endif /* NDIS50_MINIPORT */
    1.20   
    1.21   #if defined(NDIS51_MINIPORT)
    1.22   #ifndef NDIS51
    1.23   #define NDIS51
    1.24 -+#define NDIS_MINIPORT_MAJOR_VERSION 5
    1.25 ++#define NDIS_MINIPORT_MAJOR_VERSION 5
    1.26  +#define NDIS_MINIPORT_MINOR_VERSION 1
    1.27   #endif
    1.28   #endif /* NDIS51_MINIPORT */
    1.29 @@ -240,9 +240,9 @@ diff -r 79e257d5a1f7 include/ddk/ndis.h
    1.30   NDISAPI
    1.31   VOID
    1.32   DDKAPI
    1.33 -diff -r 79e257d5a1f7 include/ddk/ntddndis.h
    1.34 ---- a/include/ddk/ntddndis.h	Tue Jul 08 22:16:37 2008 -0700
    1.35 -+++ b/include/ddk/ntddndis.h	Wed Jul 09 12:36:49 2008 -0700
    1.36 +diff -r 8a2d0356d23d include/ddk/ntddndis.h
    1.37 +--- a/include/ddk/ntddndis.h	Wed Jul 09 12:54:30 2008 -0700
    1.38 ++++ b/include/ddk/ntddndis.h	Wed Jul 09 12:54:42 2008 -0700
    1.39  @@ -179,6 +179,13 @@ typedef struct _NDIS_PNP_CAPABILITIES {
    1.40   #define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS    0x00800000
    1.41   #define NDIS_MINIPORT_64BITS_DMA                      0x01000000
    1.42 @@ -257,26 +257,26 @@ diff -r 79e257d5a1f7 include/ddk/ntddndi
    1.43   #pragma pack(pop)
    1.44   
    1.45   #ifdef __cplusplus
    1.46 -diff -r 79e257d5a1f7 include/ddk/scsi.h
    1.47 ---- a/include/ddk/scsi.h	Tue Jul 08 22:16:37 2008 -0700
    1.48 -+++ b/include/ddk/scsi.h	Wed Jul 09 12:36:49 2008 -0700
    1.49 +diff -r 8a2d0356d23d include/ddk/scsi.h
    1.50 +--- a/include/ddk/scsi.h	Wed Jul 09 12:54:30 2008 -0700
    1.51 ++++ b/include/ddk/scsi.h	Wed Jul 09 12:54:42 2008 -0700
    1.52  @@ -1272,6 +1272,13 @@ typedef struct _SENSE_DATA {
    1.53   #define IOCTL_SCSI_MINIPORT_NOT_QUORUM_CAPABLE  ((FILE_DEVICE_SCSI << 16) + 0x0520)
    1.54   #define IOCTL_SCSI_MINIPORT_NOT_CLUSTER_CAPABLE ((FILE_DEVICE_SCSI << 16) + 0x0521)
    1.55   
    1.56  +/* READ_TOC formats */
    1.57 -+#define READ_TOC_FORMAT_TOC         0x00
    1.58 -+#define READ_TOC_FORMAT_SESSION     0x01
    1.59 -+#define READ_TOC_FORMAT_FULL_TOC    0x02
    1.60 -+#define READ_TOC_FORMAT_PMA         0x03
    1.61 -+#define READ_TOC_FORMAT_ATIP        0x04
    1.62 ++#define READ_TOC_FORMAT_TOC         0x00
    1.63 ++#define READ_TOC_FORMAT_SESSION     0x01
    1.64 ++#define READ_TOC_FORMAT_FULL_TOC    0x02
    1.65 ++#define READ_TOC_FORMAT_PMA         0x03
    1.66 ++#define READ_TOC_FORMAT_ATIP        0x04
    1.67  +
    1.68   /* Read Capacity Data. Returned in Big Endian format */
    1.69   typedef struct _READ_CAPACITY_DATA {
    1.70     ULONG  LogicalBlockAddress;
    1.71 -diff -r 79e257d5a1f7 include/ddk/winddk.h
    1.72 ---- a/include/ddk/winddk.h	Tue Jul 08 22:16:37 2008 -0700
    1.73 -+++ b/include/ddk/winddk.h	Wed Jul 09 12:36:49 2008 -0700
    1.74 +diff -r 8a2d0356d23d include/ddk/winddk.h
    1.75 +--- a/include/ddk/winddk.h	Wed Jul 09 12:54:30 2008 -0700
    1.76 ++++ b/include/ddk/winddk.h	Wed Jul 09 12:54:42 2008 -0700
    1.77  @@ -4896,6 +4896,10 @@ RtlStringFromGUID(
    1.78     /*IN*/ REFGUID  Guid, 
    1.79     /*OUT*/ PUNICODE_STRING  GuidString);
    1.80 @@ -310,20 +310,16 @@ diff -r 79e257d5a1f7 include/ddk/winddk.
    1.81  -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a)
    1.82  -
    1.83  -#else
    1.84 --
    1.85 --NTOSAPI
    1.86 --VOID
    1.87 --DDKAPI
    1.88 -+NTOSAPI
    1.89 -+VOID
    1.90 -+DDKAPI
    1.91 ++NTOSAPI
    1.92 ++VOID
    1.93 ++DDKAPI
    1.94  +KeRaiseIrql(
    1.95  +  /*IN*/ KIRQL new_irql,
    1.96 -+  /*OUT*/ PKIRQL old_irql);
    1.97 -+
    1.98 -+NTOSAPI
    1.99 -+VOID
   1.100 -+DDKAPI
   1.101 ++  /*OUT*/ PKIRQL old_irql);
   1.102 + 
   1.103 + NTOSAPI
   1.104 + VOID
   1.105 + DDKAPI
   1.106   KeLowerIrql(
   1.107  -  /*IN*/ KIRQL  NewIrql);
   1.108  -
   1.109 @@ -338,9 +334,9 @@ diff -r 79e257d5a1f7 include/ddk/winddk.
   1.110   
   1.111   NTOSAPI
   1.112   KIRQL
   1.113 -diff -r 79e257d5a1f7 lib/ddk/ndis.def
   1.114 ---- a/lib/ddk/ndis.def	Tue Jul 08 22:16:37 2008 -0700
   1.115 -+++ b/lib/ddk/ndis.def	Wed Jul 09 12:36:49 2008 -0700
   1.116 +diff -r 8a2d0356d23d lib/ddk/ndis.def
   1.117 +--- a/lib/ddk/ndis.def	Wed Jul 09 12:54:30 2008 -0700
   1.118 ++++ b/lib/ddk/ndis.def	Wed Jul 09 12:54:42 2008 -0700
   1.119  @@ -130,8 +130,8 @@ NdisImmediateReadSharedMemory@16
   1.120   ;NdisImmediateWritePortUlong
   1.121   ;NdisImmediateWritePortUshort
   1.122 @@ -388,9 +384,9 @@ diff -r 79e257d5a1f7 lib/ddk/ndis.def
   1.123   ;NdisSetPacketStatus
   1.124   ;NdisSetProtocolFilter
   1.125   ;NdisSetTimer
   1.126 -diff -r 79e257d5a1f7 lib/ddk/scsiport.def
   1.127 ---- a/lib/ddk/scsiport.def	Tue Jul 08 22:16:37 2008 -0700
   1.128 -+++ b/lib/ddk/scsiport.def	Wed Jul 09 12:36:49 2008 -0700
   1.129 +diff -r 8a2d0356d23d lib/ddk/scsiport.def
   1.130 +--- a/lib/ddk/scsiport.def	Wed Jul 09 12:54:30 2008 -0700
   1.131 ++++ b/lib/ddk/scsiport.def	Wed Jul 09 12:54:42 2008 -0700
   1.132  @@ -8,7 +8,7 @@ ScsiPortFlushDma@4
   1.133   ScsiPortFlushDma@4
   1.134   ScsiPortFreeDeviceBase@8