<html>
<body>
<div id="body" style="background-color:#ffffff;" >
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head" style="border-bottom-width:1px;border-bottom-style:solid;" ><td class="headtd" style="padding:0;padding-top:.2em;" colspan="4">Commit in <b><tt>lxdream/src/maple</tt></b></td></tr>
<tr><td><tt><a href="#file1">maple.c</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+5</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-2</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">d644413208a3 -> 43eef98ff265</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">vmu.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+3</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-1</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">d644413208a3 -> 43eef98ff265</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+8</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-3</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >2 modified files</small><br />
<pre class="comment" style="white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd;" >
Fix returned maple packet length for VMU block reads and get-mem-info
Fix returned block-id in block reads to match the input block-id.
</pre>
<hr /><a name="file1" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/maple</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>maple.c</b></big> <small id="info" style="color: #888888;" >d644413208a3 -> 43eef98ff265</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/maple/maple.c
+++ lxdream/src/maple/maple.c
@@ -176,7 +176,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > *((uint32_t *)return_buf) = -1;
} else {
int status, func;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- unsigned int pt, phase, block;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ unsigned int pt, phase, block<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >, blkid</span>;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > out_length = 0;
switch( cmd ) {
case MAPLE_CMD_INFO:
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -241,6 +241,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > status = MAPLE_ERR_CMD_UNKNOWN;
else status = dev->get_memory_info(dev,func, pt, return_buf+8, &out_length);
if( status == 0 ) {
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ out_length++;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > status = MAPLE_RESP_DATA;
PUTWORD(4,func);
}
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -250,6 +251,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > pt = GETBYTE(16);
phase = GETBYTE(17);
block = (GETBYTE(18)<<8) | GETBYTE(19);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ blkid = GETWORD(16);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if( dev->read_block == NULL )
status = MAPLE_ERR_CMD_UNKNOWN;
else status = dev->read_block(dev, func, pt, block, phase,
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -257,8 +259,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > &out_length );
if( status == 0 ) {
status = MAPLE_RESP_DATA;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ out_length += 2;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > PUTWORD(4,func);
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- PUTWORD(8,bl<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >ock</span>);
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ PUTWORD(8,bl<span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >kid</span>);
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
break;
case MAPLE_CMD_WRITE_BLOCK:
</pre></div>
<hr /><a name="file2" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/maple</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>vmu.c</b></big> <small id="info" style="color: #888888;" >d644413208a3 -> 43eef98ff265</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/maple/vmu.c
+++ lxdream/src/maple/vmu.c
@@ -209,7 +209,9 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > break;
case MAPLE_FUNC_MEMORY:
if( vmu->vol != NULL ) {
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- vmu_volume_read_block( vmu->vol, pt, block, outbuf );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if( vmu_volume_read_block( vmu->vol, pt, block, outbuf ) ) {
+ *buflen = VMU_BLOCK_SIZE/4;
+ }
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > return 0;
}
// Else fallthrough for now
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>