Uint64 DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
tDrvUtil_Video_2DHandlers *Handlers, int SizeofHandlers)
{
- Uint8 *stream = Buffer;
+ void *stream = Buffer;
int rem = Length;
int op;
while( rem )
{
rem --;
- op = *stream++;
+ op = *(Uint8*)stream;
+ stream = (void*)((tVAddr)stream + 1);
if(op > NUM_VIDEO_2DOPS) {
Log_Warning("DrvUtil", "DrvUtil_Video_2DStream: Unknown"
" operation %i", op);
}
- if(op*4 > SizeofHandlers) {
+ if(op*sizeof(void*) > SizeofHandlers) {
Log_Warning("DrvUtil", "DrvUtil_Video_2DStream: Driver does"
" not support op %i", op);
return Length-rem;
Handlers->Fill(
Ent,
- *(Uint16*)(&stream[0]), *(Uint16*)(&stream[2]),
- *(Uint16*)(&stream[4]), *(Uint16*)(&stream[6]),
- *(Uint32*)(&stream[8])
+ ((Uint16*)stream)[0], ((Uint16*)stream)[1],
+ ((Uint16*)stream)[2], ((Uint16*)stream)[3],
+ ((Uint32*)stream)[2]
);
rem -= 12;
- stream += 12;
+ stream = (void*)((tVAddr)stream + 12);
break;
case VIDEO_2DOP_BLIT:
return Length-rem;
}
- //Log("Handlers->Blit{%}}(%p, %i,%i, %i,%i, %i,%i)",
- // Handlers->Blit, Ent,
- // *(Uint16*)(&stream[0]), *(Uint16*)(&stream[2]),
- // *(Uint16*)(&stream[4]), *(Uint16*)(&stream[6]),
- // *(Uint16*)(&stream[8]), *(Uint16*)(&stream[10])
- // );
Handlers->Blit(
Ent,
- *(Uint16*)(&stream[0]), *(Uint16*)(&stream[2]),
- *(Uint16*)(&stream[4]), *(Uint16*)(&stream[6]),
- *(Uint16*)(&stream[8]), *(Uint16*)(&stream[10])
+ ((Uint16*)stream)[0], ((Uint16*)stream)[1],
+ ((Uint16*)stream)[2], ((Uint16*)stream)[3],
+ ((Uint16*)stream)[4], ((Uint16*)stream)[5]
);
rem -= 12;
- stream += 12;
+ stream = (void*)((tVAddr)stream + 12);
break;
}
return leading;
}
- Buffer += leading;
+ Buffer = (Uint8*)Buffer + leading;
block ++;
num = ( Length - leading ) / BlockSize;
tailings = Length - num * BlockSize - leading;
{
LOG("Reading %i bytes from last block", tailings);
block += num;
- Buffer += num * BlockSize;
+ Buffer = (Uint8*)Buffer + num * BlockSize;
ret = ReadBlocks(block, 1, tmp, Argument);
if(ret != 1) {
LEAVE('X', leading + num * BlockSize);
return leading;
}
- Buffer += leading;
+ Buffer = (Uint8*)Buffer + leading;
block ++;
num = ( Length - leading ) / BlockSize;
tailings = Length - num * BlockSize - leading;
{
LOG("Writing %i bytes to last block", tailings);
block += num;
- Buffer += num * BlockSize;
+ Buffer = (Uint8*)Buffer + num * BlockSize;
// Read
ret = ReadBlocks(block, 1, tmp, Argument);
if(ret != 1) {