git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/ISADMA - Removed commented out cli/sti
[tpg/acess2.git]
/
Kernel
/
drvutil.c
diff --git
a/Kernel/drvutil.c
b/Kernel/drvutil.c
index
bac7894
..
e86f9a8
100644
(file)
--- a/
Kernel/drvutil.c
+++ b/
Kernel/drvutil.c
@@
-4,8
+4,8
@@
*/
#define DEBUG 0
#include <acess.h>
*/
#define DEBUG 0
#include <acess.h>
-#include <
tpl
_drv_disk.h>
-#include <
tpl
_drv_video.h>
+#include <
api
_drv_disk.h>
+#include <
api
_drv_video.h>
// === CODE ===
// --- Video Driver Helpers ---
// === CODE ===
// --- Video Driver Helpers ---
@@
-26,7
+26,7
@@
Uint64 DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
" operation %i", op);
}
" 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;
Log_Warning("DrvUtil", "DrvUtil_Video_2DStream: Driver does"
" not support op %i", op);
return Length-rem;
@@
-49,7
+49,7
@@
Uint64 DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
Ent,
((Uint16*)stream)[0], ((Uint16*)stream)[1],
((Uint16*)stream)[2], ((Uint16*)stream)[3],
Ent,
((Uint16*)stream)[0], ((Uint16*)stream)[1],
((Uint16*)stream)[2], ((Uint16*)stream)[3],
- ((Uint32*)stream)[
4
]
+ ((Uint32*)stream)[
2
]
);
rem -= 12;
);
rem -= 12;
@@
-57,7
+57,7
@@
Uint64 DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
break;
case VIDEO_2DOP_BLIT:
break;
case VIDEO_2DOP_BLIT:
- if(rem < 1
6
) return Length-rem;
+ if(rem < 1
2
) return Length-rem;
if(!Handlers->Blit) {
Log_Warning("DrvUtil", "DrvUtil_Video_2DStream: Driver"
if(!Handlers->Blit) {
Log_Warning("DrvUtil", "DrvUtil_Video_2DStream: Driver"
@@
-72,8
+72,8
@@
Uint64 DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
((Uint16*)stream)[4], ((Uint16*)stream)[5]
);
((Uint16*)stream)[4], ((Uint16*)stream)[5]
);
- rem -= 1
6
;
- stream = (void*)((tVAddr)stream + 1
6
);
+ rem -= 1
2
;
+ stream = (void*)((tVAddr)stream + 1
2
);
break;
}
break;
}
UCC
git Repository :: git.ucc.asn.au