From e351919351a955c4271edaac56b320302472743a Mon Sep 17 00:00:00 2001 From: NicJA Date: Thu, 28 Feb 2013 12:07:26 +0000 Subject: [PATCH] use the correct vc chan name git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@46717 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- .../hidd.videocoregfx/videocoregfx_bitmap_common.c | 4 ++-- arch/arm-raspi/hidd.videocoregfx/videocoregfx_hardware.h | 2 +- arch/arm-raspi/hidd.videocoregfx/videocoregfx_hdmi.c | 4 ++-- arch/arm-raspi/hidd.videocoregfx/videocoregfx_init.c | 4 ++-- arch/arm-raspi/hidd.videocoregfx/videocoregfx_memory.c | 16 ++++++++-------- arch/arm-raspi/hidd.videocoregfx/videocoregfx_onbitmap.c | 12 ++++++------ 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_bitmap_common.c b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_bitmap_common.c index 175db00645..00646fd65f 100644 --- a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_bitmap_common.c +++ b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_bitmap_common.c @@ -77,8 +77,8 @@ BOOL MNAME_BM(SetColors)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetCo (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[7 + col_i ] = 0; (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[7 + col_i + 1] = 0; // terminate tag - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); - if (VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); + if (VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage) { D(bug("[VideoCoreGfx] %s: Palette set [status %08x]\n", __PRETTY_FUNCTION__, (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[7 + col_i])); } diff --git a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hardware.h b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hardware.h index 2ad7525eb3..20d827d3f8 100644 --- a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hardware.h +++ b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hardware.h @@ -11,7 +11,7 @@ #include "videocoregfx_class.h" #include "videocoregfx_bitmap.h" -#define VCMB_FBCHAN 8 +#define VCMB_PROPCHAN 8 struct HWData { ULONG void0; diff --git a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hdmi.c b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hdmi.c index e166b665f2..d7de2ab0b3 100644 --- a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hdmi.c +++ b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_hdmi.c @@ -36,8 +36,8 @@ int FNAME_SUPPORT(HDMI_SyncGen)(struct List *modelist, OOP_Class *cl) xsd->vcsd_VCMBoxMessage[7] = 0; // terminate tag /* for now lets just get the mode the display is currently running.. */ - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, xsd->vcsd_VCMBoxMessage); - if ((VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == xsd->vcsd_VCMBoxMessage) && + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, xsd->vcsd_VCMBoxMessage); + if ((VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == xsd->vcsd_VCMBoxMessage) && (xsd->vcsd_VCMBoxMessage[1] == VCTAG_RESP)) { if ((hdmi_mode = AllocMem(sizeof(struct DisplayMode), MEMF_PUBLIC)) != NULL) diff --git a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_init.c b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_init.c index c6abc403e8..e84a448aa9 100644 --- a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_init.c +++ b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_init.c @@ -112,8 +112,8 @@ static int FNAME_SUPPORT(Init)(LIBBASETYPEPTR LIBBASE) xsd->vcsd_VCMBoxMessage[7] = 0; // terminate tag - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, xsd->vcsd_VCMBoxMessage); - if (VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == xsd->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, xsd->vcsd_VCMBoxMessage); + if (VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == xsd->vcsd_VCMBoxMessage) { if (FNAME_SUPPORT(InitMem)(xsd->vcsd_VCMBoxMessage[5], xsd->vcsd_VCMBoxMessage[6], LIBBASE)) { diff --git a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_memory.c b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_memory.c index efa7330466..c5c6bf9c50 100644 --- a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_memory.c +++ b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_memory.c @@ -71,8 +71,8 @@ void *FNAME_SUPPORT(Alloc)(struct MemHeaderExt *mhe, IPTR size, ULONG *flags) xsd->vcsd_VCMBoxMessage[8] = 0; // terminate tag - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, xsd->vcsd_VCMBoxMessage); - if (VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == xsd->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, xsd->vcsd_VCMBoxMessage); + if (VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == xsd->vcsd_VCMBoxMessage) { D(bug("[VideoCoreGfx] %s: Allocated %d bytes, memhandle @ 0x%p\n", __PRETTY_FUNCTION__, xsd->vcsd_VCMBoxMessage[4], xsd->vcsd_VCMBoxMessage[7])); @@ -103,8 +103,8 @@ void *FNAME_SUPPORT(LockMem)(struct MemHeaderExt *mhe, void *memhandle) xsd->vcsd_VCMBoxMessage[6] = 0; // terminate tag - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, xsd->vcsd_VCMBoxMessage); - if (VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == xsd->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, xsd->vcsd_VCMBoxMessage); + if (VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == xsd->vcsd_VCMBoxMessage) { D(bug("[VideoCoreGfx] %s: Memory locked @ 0x%p\n", __PRETTY_FUNCTION__, xsd->vcsd_VCMBoxMessage[5])); return xsd->vcsd_VCMBoxMessage[5]; @@ -131,8 +131,8 @@ void *FNAME_SUPPORT(UnLockMem)(struct MemHeaderExt *mhe, void *memhandle) xsd->vcsd_VCMBoxMessage[6] = 0; // terminate tag - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, xsd->vcsd_VCMBoxMessage); - if (VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == xsd->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, xsd->vcsd_VCMBoxMessage); + if (VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == xsd->vcsd_VCMBoxMessage) { D(bug("[VideoCoreGfx] %s: Memory unlocked [status %08x]\n", __PRETTY_FUNCTION__, xsd->vcsd_VCMBoxMessage[5])); return xsd->vcsd_VCMBoxMessage[5]; @@ -164,8 +164,8 @@ void FNAME_SUPPORT(Free)(struct MemHeaderExt *mhe, APTR memhandle, IPTR size) xsd->vcsd_VCMBoxMessage[6] = 0; // terminate tag - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, xsd->vcsd_VCMBoxMessage); - if (VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == xsd->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, xsd->vcsd_VCMBoxMessage); + if (VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == xsd->vcsd_VCMBoxMessage) { mhe->mhe_MemHeader.mh_Free += size; diff --git a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_onbitmap.c b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_onbitmap.c index 80d50956f1..376059096a 100644 --- a/arch/arm-raspi/hidd.videocoregfx/videocoregfx_onbitmap.c +++ b/arch/arm-raspi/hidd.videocoregfx/videocoregfx_onbitmap.c @@ -130,8 +130,8 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[3] = 0; (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[4] = 0; (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[5] = 0; // terminate tags - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, (unsigned int)(&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); - VCMBoxRead(VCMB_BASE, VCMB_FBCHAN); + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, (unsigned int)(&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); + VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN); } #endif (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[1] = VCTAG_REQ; @@ -164,8 +164,8 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[0] = (22 << 2); // fill in request size #if !defined(DEBUGDISPLAY) - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, (unsigned int)(&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); - if ((VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, (unsigned int)(&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); + if ((VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage) && ((&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[1] == VCTAG_RESP) && ((&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[18] == (VCTAG_RESP + 8))) { @@ -183,8 +183,8 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[5] = 0; (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[6] = 0; // terminate tag - VCMBoxWrite(VCMB_BASE, VCMB_FBCHAN, (unsigned int)(&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); - if ((VCMBoxRead(VCMB_BASE, VCMB_FBCHAN) == (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage) + VCMBoxWrite(VCMB_BASE, VCMB_PROPCHAN, (unsigned int)(&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage); + if ((VCMBoxRead(VCMB_BASE, VCMB_PROPCHAN) == (&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage) && ((&((struct VideoCoreGfxBase *)cl->UserData)->vsd)->vcsd_VCMBoxMessage[4] == (VCTAG_RESP + 4))) { // Set the bitmaps stride.. -- 2.11.4.GIT