'[ros-diffs] [CVS reactos] - Initialized the srb on each call to'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ros-diffs
Subject:    [ros-diffs] [CVS reactos] - Initialized the srb on each call to
From:       hbirr () osexperts ! com (Hartmut Birr)
Date:       2004-04-23 14:29:07
Message-ID: 20040423142907.C3A9B43AA () mok ! osexperts ! com
[Download RAW message or body]

<html>
<head>
<style><!--
  body {background-color:#ffffff;}
  .file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
  .pathname {font-family:monospace; float:right;}
  .fileheader {margin-bottom:.5em;}
  .diff {margin:0;}
  .tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
  .tasklist ul {margin-top:0;margin-bottom:0;}
  tr.alt {background-color:#eeeeee}
  #added {background-color:#ddffdd;}
  #addedchars {background-color:#99ff99;font-weight:bolder;}
  tr.alt #added {background-color:#ccf7cc;}
  #removed {background-color:#ffdddd;}
  #removedchars {background-color:#ff9999;font-weight:bolder;}
  tr.alt #removed {background-color:#f7cccc;}
  #info {color:#888888;}
  #context {background-color:#eeeeee;}
  td {padding-left:.3em;padding-right:.3em;}
  tr.head {border-bottom-width:1px;border-bottom-style:solid;}
  tr.head td {padding:0;padding-top:.2em;}
  .task {background-color:#ffff00;}
  .comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
  .error {color:red;}
  hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in \
<b><tt>reactos/drivers/storage/scsiport</tt></b><span id="info"> on \
MAIN</span></td></tr> <tr><td><tt><a href="#file1">scsiport.c</a></tt></td><td \
align="right" id="added">+18</td><td align="right" id="removed">-19</td><td \
nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage/scsiport/scsiport.c?rev=1.54&amp;content-type=text/x-cvsweb-markup">1.54</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage/scsiport/scsiport.c.diff?r1=text&amp;tr1=1.54&amp;r2=text&amp;tr2=1.55&amp;f=h">-&gt;</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage/scsiport/scsiport.c?rev=1.55&amp;content-type=text/x-cvsweb-markup">1.55</a></td></tr>
 </table>
<pre class="comment">
- Initialized the srb on each call to SpiSendInquiry.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers">drivers</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage">storage</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage/scsiport">scsiport</a><br \
/></span> <div class="fileheader"><big><b>scsiport.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage/scsiport/scsiport.c?rev=1.54&amp;content-type=text/x-cvsweb-markup">1.54</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage/scsiport/scsiport.c.diff?r1=text&amp;tr1=1.54&amp;r2=text&amp;tr2=1.55&amp;f=h">-&gt;</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/drivers/storage/scsiport/scsiport.c?rev=1.55&amp;content-type=text/x-cvsweb-markup">1.55</a></small></div>
 <pre class="diff"><small id="info">diff -u -r1.54 -r1.55
--- scsiport.c	16 Apr 2004 13:39:46 -0000	1.54
+++ scsiport.c	23 Apr 2004 14:29:07 -0000	1.55
@@ -16,7 +16,7 @@
</small></pre><pre class="diff" id="context">  *  along with this program; if not, \
                write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
</pre><pre class="diff" id="removed">-/* $Id: scsiport.c,v 1.54 2004/04/16 13:39:46 \
ekohl Exp $ </pre><pre class="diff" id="added">+/* $Id: scsiport.c,v 1.55 2004/04/23 \
14:29:07 hbirr Exp $ </pre><pre class="diff" id="context">  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
</pre><pre class="diff"><small id="info">@@ -1840,36 +1840,35 @@
</small></pre><pre class="diff" id="context">   ULONG Bus;
   ULONG Target;
   ULONG Lun;
</pre><pre class="diff" id="added">+  PVOID DataBuffer;
</pre><pre class="diff" id="context">   NTSTATUS Status;
 
   DPRINT ("SpiScanAdapter() called\n");
 
</pre><pre class="diff" id="removed">-  RtlZeroMemory(&amp;Srb,
-		sizeof(SCSI_REQUEST_BLOCK));
-  Srb.SrbFlags = SRB_FLAGS_DATA_IN;
-  Srb.DataBuffer = ExAllocatePool(NonPagedPool, 256);
-  Srb.Function = SRB_FUNCTION_EXECUTE_SCSI;
-  Srb.DataTransferLength = 255; //256;
-  Srb.CdbLength = 6;
-
-  Cdb = (PCDB) &amp;Srb.Cdb;
-
-  Cdb-&gt;CDB6INQUIRY.OperationCode = SCSIOP_INQUIRY;
-  Cdb-&gt;CDB6INQUIRY.AllocationLength = 255;
</pre><pre class="diff" id="added">+  DataBuffer = ExAllocatePool(NonPagedPool, 256);
</pre><pre class="diff" id="context"> 
   for (Bus = 0; Bus &lt; DeviceExtension-&gt;PortConfig-&gt;NumberOfBuses; Bus++)
     {
</pre><pre class="diff" id="removed">-      Srb.PathId = Bus;
-
</pre><pre class="diff" id="context">       for (Target = 0; Target &lt; \
DeviceExtension-&gt;PortConfig-&gt;MaximumNumberOfTargets; Target++)  {
</pre><pre class="diff" id="removed">-	  Srb.TargetId = Target;
-
</pre><pre class="diff" id="context"> 	  for (Lun = 0; Lun &lt; \
SCSI_MAXIMUM_LOGICAL_UNITS; Lun++)  {
</pre><pre class="diff" id="added">+              RtlZeroMemory(&amp;Srb,
+		            sizeof(SCSI_REQUEST_BLOCK));
+              Srb.SrbFlags = SRB_FLAGS_DATA_IN;
+              Srb.DataBuffer = DataBuffer;
+              Srb.Function = SRB_FUNCTION_EXECUTE_SCSI;
+              Srb.DataTransferLength = 255; //256;
+              Srb.CdbLength = 6;
</pre><pre class="diff" id="context"> 	      Srb.Lun = Lun;
</pre><pre class="diff" id="added">+	      Srb.PathId = Bus;
+      	      Srb.TargetId = Target;
</pre><pre class="diff" id="context"> 	      Srb.SrbStatus = SRB_STATUS_SUCCESS;
 
</pre><pre class="diff" id="added">+              Cdb = (PCDB) &amp;Srb.Cdb;
+
+              Cdb-&gt;CDB6INQUIRY.OperationCode = SCSIOP_INQUIRY;
+              Cdb-&gt;CDB6INQUIRY.AllocationLength = 255;
</pre><pre class="diff" id="context"> 	      Cdb-&gt;CDB6INQUIRY.LogicalUnitNumber = \
Lun;  
 	      RtlZeroMemory(Srb.DataBuffer, 256);
</pre><pre class="diff"><small id="info">@@ -1881,7 +1880,7 @@
</small></pre><pre class="diff" id="context"> 	      if (LunExtension == NULL)
 		{
 		  DPRINT("Failed to allocate the LUN extension!\n");
</pre><pre class="diff" id="removed">-		  ExFreePool(<span \
id="removedchars">Srb.</span>DataBuffer); </pre><pre class="diff" id="added">+		  \
ExFreePool(DataBuffer); </pre><pre class="diff" id="context"> 		  return;
 		}
 
</pre><pre class="diff"><small id="info">@@ -1909,7 +1908,7 @@
</small></pre><pre class="diff" id="context"> 	}
     }
 
</pre><pre class="diff" id="removed">-  ExFreePool(<span \
id="removedchars">Srb.</span>DataBuffer); </pre><pre class="diff" id="added">+  \
ExFreePool(DataBuffer); </pre><pre class="diff" id="context"> 
   DPRINT ("SpiScanAdapter() done\n");
 }
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" \
title="commit -&gt; email">CVSspam</a> 0.2.8</small></center> </body></html>


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic