git.ucc.asn.au
/
tpg
/
acess2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
36e4fbb
)
UDI/GFX - fiddling
author
John Hodge
<
[email protected]
>
Mon, 24 Nov 2014 07:32:58 +0000
(15:32 +0800)
committer
John Hodge
<
[email protected]
>
Mon, 24 Nov 2014 07:32:58 +0000
(15:32 +0800)
KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
patch
|
blob
|
history
KernelLand/Modules/Interfaces/UDI/trans/gfx.c
patch
|
blob
|
history
KernelLand/Modules/Interfaces/UDI/trans/gfx.udic
patch
|
blob
|
history
UDI/drivers/gfx_bochs/bochsga_common.h
patch
|
blob
|
history
UDI/drivers/gfx_bochs/bochsga_core.c
patch
|
blob
|
history
diff --git
a/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
b/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
index
651329d
..
9909655
100644
(file)
--- a/
KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
+++ b/
KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
@@
-6,6
+6,8
@@
* - PCI Bus Driver
*/
#define DEBUG 0
* - PCI Bus Driver
*/
#define DEBUG 0
+#define UDI_VERSION 0x101
+#define UDI_PHYSIO_VERSION 0x101
#define UDI_PCI_VERSION 0x101
#include <udi.h>
#include <udi_physio.h>
#define UDI_PCI_VERSION 0x101
#include <udi.h>
#include <udi_physio.h>
diff --git
a/KernelLand/Modules/Interfaces/UDI/trans/gfx.c
b/KernelLand/Modules/Interfaces/UDI/trans/gfx.c
index
5530e7f
..
73efc10
100644
(file)
--- a/
KernelLand/Modules/Interfaces/UDI/trans/gfx.c
+++ b/
KernelLand/Modules/Interfaces/UDI/trans/gfx.c
@@
-70,7
+70,7
@@
void acessgfx_channel_event_ind$bound(udi_gfx_bind_cb_t *cb)
rdata_t *rdata = UDI_GCB(bind_cb)->context;
// request metalanguage-level bind
rdata_t *rdata = UDI_GCB(bind_cb)->context;
// request metalanguage-level bind
- udi_gfx_bind_req(bind_cb)
+ udi_gfx_bind_req(bind_cb)
;
// Continued in acessgfx_bind_ack
}
// Continued in acessgfx_bind_ack
}
diff --git
a/KernelLand/Modules/Interfaces/UDI/trans/gfx.udic
b/KernelLand/Modules/Interfaces/UDI/trans/gfx.udic
index
d7364ea
..
796228a
100644
(file)
--- a/
KernelLand/Modules/Interfaces/UDI/trans/gfx.udic
+++ b/
KernelLand/Modules/Interfaces/UDI/trans/gfx.udic
@@
-45,12
+45,11
@@
void usage_ind(udi_usage_cb_t *cb, udi_ubit8_t resource_level)
{
state_cb->subsystem = i;
state_cb->attribute = UDI_GFX_PROP_PIXELFORMAT;
{
state_cb->subsystem = i;
state_cb->attribute = UDI_GFX_PROP_PIXELFORMAT;
- [pixfmt]
:[NAK,status] = udi_gfx_get_engine_req(state_cb);
-
if(NAK)
{
+ [pixfmt]
= @TRY_NAK[status] udi_gfx_get_engine_req(state_cb)
+ {
// Shit to do if NAK happens
return ;
// Shit to do if NAK happens
return ;
- }
- else {
+ // break PIXFMT_NONE;
}
// TODO: Annotate udi_gfx_state_cb_t to note values are kept?
}
// TODO: Annotate udi_gfx_state_cb_t to note values are kept?
diff --git
a/UDI/drivers/gfx_bochs/bochsga_common.h
b/UDI/drivers/gfx_bochs/bochsga_common.h
index
3b3a5db
..
5d40cfa
100644
(file)
--- a/
UDI/drivers/gfx_bochs/bochsga_common.h
+++ b/
UDI/drivers/gfx_bochs/bochsga_common.h
@@
-25,6
+25,7
@@
#define BOCHSGA_CB_GFX_COMMAND 5
#define BOCHSGA_MSGNUM_PROPUNK 1001
#define BOCHSGA_CB_GFX_COMMAND 5
#define BOCHSGA_MSGNUM_PROPUNK 1001
+#define BOCHSGA_MSGNUM_BUFUNK 1002
/**
* \}
*/
/**
* \}
*/
diff --git
a/UDI/drivers/gfx_bochs/bochsga_core.c
b/UDI/drivers/gfx_bochs/bochsga_core.c
index
8f6dae8
..
458f893
100644
(file)
--- a/
UDI/drivers/gfx_bochs/bochsga_core.c
+++ b/
UDI/drivers/gfx_bochs/bochsga_core.c
@@
-382,6
+382,7
@@
void bochsga_gfx_engine_command_req(udi_gfx_command_cb_t *cb)
}
void bochsga_gfx_buffer_info_req(udi_gfx_buffer_info_cb_t *cb)
{
}
void bochsga_gfx_buffer_info_req(udi_gfx_buffer_info_cb_t *cb)
{
+ udi_cb_t *gcb = UDI_GCB(cb);
switch(cb->buffer_index)
{
case 0:
switch(cb->buffer_index)
{
case 0:
UCC
git Repository :: git.ucc.asn.au