X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FDisplay%2FVESA%2Fmain.c;h=b543c239885f45f3f5d0bfa835e2034a81b8fde8;hb=2826faf8dc09e92249a315b6a0c4ca5048c08a33;hp=216fcd1d027b12a2e46a6db4080a1138df57f999;hpb=049de1f2533477716a12a708c097b199eaa8fb6c;p=tpg%2Facess2.git diff --git a/Modules/Display/VESA/main.c b/Modules/Display/VESA/main.c index 216fcd1d..b543c239 100644 --- a/Modules/Display/VESA/main.c +++ b/Modules/Display/VESA/main.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include @@ -15,36 +15,54 @@ // === CONSTANTS === #define FLAG_LFB 0x1 +#define VESA_DEFAULT_FRAMEBUFFER (KERNEL_BASE|0xA0000) +#define BLINKING_CURSOR 1 +#if BLINKING_CURSOR +# define VESA_CURSOR_PERIOD 1000 +#endif // === PROTOTYPES === int Vesa_Install(char **Arguments); Uint64 Vesa_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer); Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer); - int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data); + int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data); int Vesa_Int_SetMode(int Mode); int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data); int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data); +void Vesa_int_HideCursor(void); +void Vesa_int_ShowCursor(void); +void Vesa_FlipCursor(void *Arg); // === GLOBALS === MODULE_DEFINE(0, VERSION, Vesa, Vesa_Install, NULL, "PCI", "VM8086", NULL); tDevFS_Driver gVesa_DriverStruct = { - NULL, "VESA", + NULL, "Vesa", { .Read = Vesa_Read, .Write = Vesa_Write, - .IOCtl = Vesa_Ioctl + .IOCtl = Vesa_IOCtl } }; -tSpinlock glVesa_Lock; +tMutex glVesa_Lock; tVM8086 *gpVesa_BiosState; - int giVesaCurrentMode = -1; int giVesaDriverId = -1; -char *gVesaFramebuffer = (void*)0xC00A0000; +// --- Video Modes --- + int giVesaCurrentMode = 0; tVesa_Mode *gVesa_Modes; +tVesa_Mode *gpVesaCurMode; int giVesaModeCount = 0; - int giVesaPageCount = 0; +// --- Framebuffer --- +char *gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER; + int giVesaPageCount = 0; //!< Framebuffer size in pages +// --- Cursor Control --- + int giVesaCursorX = -1; + int giVesaCursorY = -1; + int giVesaCursorTimer = -1; // Invalid timer + int gbVesa_CursorVisible = 0; +// --- 2D Video Stream Handlers --- +tDrvUtil_Video_BufInfo gVesa_BufInfo; -//CODE +// === CODE === int Vesa_Install(char **Arguments) { tVesa_CallInfo *info; @@ -66,21 +84,27 @@ int Vesa_Install(char **Arguments) // Call Interrupt VM8086_Int(gpVesa_BiosState, 0x10); if(gpVesa_BiosState->AX != 0x004F) { - Log_Warning("Vesa", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)\n", gpVesa_BiosState->AX); + Log_Warning("VESA", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)", gpVesa_BiosState->AX); return MODULE_ERR_NOTNEEDED; } + //Log_Debug("VESA", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs); modes = (Uint16 *) VM8086_GetPointer(gpVesa_BiosState, info->VideoModes.seg, info->VideoModes.ofs); // Read Modes - for( giVesaModeCount = 1; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ ); + for( giVesaModeCount = 0; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ ); gVesa_Modes = (tVesa_Mode *)malloc( giVesaModeCount * sizeof(tVesa_Mode) ); + Log_Debug("VESA", "%i Modes", giVesaModeCount); + // Insert Text Mode gVesa_Modes[0].width = 80; gVesa_Modes[0].height = 25; - gVesa_Modes[0].bpp = 4; + gVesa_Modes[0].bpp = 12; gVesa_Modes[0].code = 0x3; + gVesa_Modes[0].flags = 1; + gVesa_Modes[0].fbSize = 80*25*2; + gVesa_Modes[0].framebuffer = 0xB8000; for( i = 1; i < giVesaModeCount; i++ ) { @@ -98,18 +122,19 @@ int Vesa_Install(char **Arguments) { gVesa_Modes[i].flags |= FLAG_LFB; gVesa_Modes[i].framebuffer = modeinfo->physbase; - gVesa_Modes[i].fbSize = modeinfo->Xres*modeinfo->Yres*modeinfo->bpp/8; + gVesa_Modes[i].fbSize = modeinfo->Yres*modeinfo->pitch; } else { gVesa_Modes[i].framebuffer = 0; gVesa_Modes[i].fbSize = 0; } + gVesa_Modes[i].pitch = modeinfo->pitch; gVesa_Modes[i].width = modeinfo->Xres; gVesa_Modes[i].height = modeinfo->Yres; gVesa_Modes[i].bpp = modeinfo->bpp; #if DEBUG - LogF(" Vesa_Install: 0x%x - %ix%ix%i\n", + Log_Log("VESA", "0x%x - %ix%ix%i", gVesa_Modes[i].code, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp); #endif } @@ -127,7 +152,7 @@ int Vesa_Install(char **Arguments) Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer) { #if DEBUG >= 2 - LogF("Vesa_Read: () - NULL\n"); + Log("Vesa_Read: () - NULL\n"); #endif return 0; } @@ -137,43 +162,26 @@ Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer) */ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) { - ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Bufffer); - - if(Buffer == NULL) { - LEAVE('i', 0); - return 0; - } - if( gVesa_Modes[giVesaCurrentMode].framebuffer == 0 ) { Log_Warning("VESA", "Vesa_Write - Non-LFB Modes not yet supported."); - LEAVE('i', 0); - return 0; - } - if(gVesa_Modes[giVesaCurrentMode].fbSize < Offset+Length) - { - Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow"); - LEAVE('i', 0); return 0; } - - memcpy(gVesaFramebuffer + Offset, Buffer, Length); - - LEAVE('X', Length); - return Length; + + return DrvUtil_Video_WriteLFB(&gVesa_BufInfo, Offset, Length, Buffer); } +const char *csaVESA_IOCtls[] = {DRV_IOCTLNAMES, DRV_VIDEO_IOCTLNAMES, NULL}; /** - * \fn int Vesa_Ioctl(vfs_node *node, int id, void *data) * \brief Handle messages to the device */ -int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data) +int Vesa_IOCtl(tVFS_Node *Node, int ID, void *Data) { + int ret; + //Log_Debug("VESA", "Vesa_Ioctl: (Node=%p, ID=%i, Data=%p)", Node, ID, Data); switch(ID) { - case DRV_IOCTL_TYPE: return DRV_TYPE_VIDEO; - case DRV_IOCTL_IDENT: memcpy("VESA", Data, 4); return 1; - case DRV_IOCTL_VERSION: return VERSION; - + BASE_IOCTLS(DRV_TYPE_VIDEO, "VESA", VERSION, csaVESA_IOCtls); + case VIDEO_IOCTL_GETSETMODE: if( !Data ) return giVesaCurrentMode; return Vesa_Int_SetMode( *(int*)Data ); @@ -183,30 +191,55 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data) case VIDEO_IOCTL_MODEINFO: return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data); - case VIDEO_IOCTL_REQLFB: // Request Linear Framebuffer + case VIDEO_IOCTL_SETBUFFORMAT: + Vesa_int_HideCursor(); + ret = gVesa_BufInfo.BufferFormat; + if(Data) gVesa_BufInfo.BufferFormat = *(int*)Data; + if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT) + DrvUtil_Video_SetCursor( &gVesa_BufInfo, &gDrvUtil_TextModeCursor ); + Vesa_int_ShowCursor(); + return ret; + + case VIDEO_IOCTL_SETCURSOR: // Set cursor position + Vesa_int_HideCursor(); + giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x; + giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y; + Vesa_int_ShowCursor(); + return 0; + + case VIDEO_IOCTL_SETCURSORBITMAP: + DrvUtil_Video_SetCursor( &gVesa_BufInfo, Data ); return 0; } return 0; } +/** + * \brief Updates the video mode + */ int Vesa_Int_SetMode(int mode) { - #if DEBUG - LogF("Vesa_Int_SetMode: (mode=%i)\n", mode); - #endif - // Sanity Check values if(mode < 0 || mode > giVesaModeCount) return -1; + + Log_Log("VESA", "Setting mode to %i (%ix%i %ibpp)", + mode, + gVesa_Modes[mode].width, gVesa_Modes[mode].height, + gVesa_Modes[mode].bpp + ); // Check for fast return if(mode == giVesaCurrentMode) return 1; - LOCK( &glVesa_Lock ); + Time_RemoveTimer(giVesaCursorTimer); + giVesaCursorTimer = -1; + + Mutex_Acquire( &glVesa_Lock ); gpVesa_BiosState->AX = 0x4F02; gpVesa_BiosState->BX = gVesa_Modes[mode].code; if(gVesa_Modes[mode].flags & FLAG_LFB) { - LogF(" Vesa_Int_SetMode: Using LFB\n"); + Log_Log("VESA", "Using LFB"); gpVesa_BiosState->BX |= 0x4000; // Bit 14 - Use LFB } @@ -214,18 +247,26 @@ int Vesa_Int_SetMode(int mode) VM8086_Int(gpVesa_BiosState, 0x10); // Map Framebuffer - MM_UnmapHWPages((tVAddr)gVesaFramebuffer, giVesaPageCount); + if( (tVAddr)gpVesa_Framebuffer != VESA_DEFAULT_FRAMEBUFFER ) + MM_UnmapHWPages((tVAddr)gpVesa_Framebuffer, giVesaPageCount); giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12; - gVesaFramebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount); + gpVesa_Framebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount); - LogF(" Vesa_Int_SetMode: Fb (Phys) = 0x%x\n", gVesa_Modes[mode].framebuffer); - LogF(" Vesa_Int_SetMode: Fb (Virt) = 0x%x\n", gVesaFramebuffer); + Log_Log("VESA", "Framebuffer (Phys) = 0x%x, (Virt) = 0x%x, Size = 0x%x", + gVesa_Modes[mode].framebuffer, gpVesa_Framebuffer, giVesaPageCount << 12); // Record Mode Set giVesaCurrentMode = mode; + gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode]; - RELEASE( &glVesa_Lock ); - + Mutex_Release( &glVesa_Lock ); + + gVesa_BufInfo.Framebuffer = gpVesa_Framebuffer; + gVesa_BufInfo.Pitch = gVesa_Modes[mode].pitch; + gVesa_BufInfo.Width = gVesa_Modes[mode].width; + gVesa_BufInfo.Height = gVesa_Modes[mode].height; + gVesa_BufInfo.Depth = gVesa_Modes[mode].bpp; + return 1; } @@ -234,34 +275,45 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data) int i; int best = -1, bestFactor = 1000; int factor, tmp; - #if DEBUG - LogF("Vesa_Int_FindMode: (data={width:%i,height:%i,bpp:%i})\n", data->width, data->height, data->bpp); - #endif + + ENTER("idata->width idata->height idata->bpp", data->width, data->height, data->bpp); + for(i=0;i= 2 - LogF("Mode %i (%ix%ix%i), ", i, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp); - #endif + LOG("Mode %i (%ix%ix%i)", i, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp); - if(gVesa_Modes[i].width == data->width - && gVesa_Modes[i].height == data->height - && gVesa_Modes[i].bpp == data->bpp) + if(gVesa_Modes[i].width == data->width && gVesa_Modes[i].height == data->height) { - #if DEBUG >= 2 - LogF("Perfect!\n"); - #endif - best = i; - break; + //if( (data->bpp == 32 || data->bpp == 24) + // && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) ) + if( data->bpp == gVesa_Modes[i].bpp ) + { + LOG("Perfect!"); + best = i; + break; + } } - tmp = gVesa_Modes[i].width * gVesa_Modes[i].height * gVesa_Modes[i].bpp; - tmp -= data->width * data->height * data->bpp; + tmp = gVesa_Modes[i].width * gVesa_Modes[i].height; + tmp -= data->width * data->height; tmp = tmp < 0 ? -tmp : tmp; - factor = tmp * 100 / (data->width * data->height * data->bpp); + factor = tmp * 1000 / (data->width * data->height); - #if DEBUG >= 2 - LogF("factor = %i\n", factor); - #endif + if( data->bpp == 8 && gVesa_Modes[i].bpp != 8 ) continue; + if( data->bpp == 16 && gVesa_Modes[i].bpp != 16 ) continue; + + if( (data->bpp == 32 || data->bpp == 24) + && (gVesa_Modes[i].bpp == 32 || gVesa_Modes[i].bpp == 24) ) + { + if( data->bpp == gVesa_Modes[i].bpp ) + factor /= 2; + } + else { + if( data->bpp != gVesa_Modes[i].bpp ) + continue ; + } + + LOG("factor = %i", factor); if(factor < bestFactor) { @@ -273,6 +325,7 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data) data->width = gVesa_Modes[best].width; data->height = gVesa_Modes[best].height; data->bpp = gVesa_Modes[best].bpp; + LEAVE('i', best); return best; } @@ -284,3 +337,59 @@ int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data) data->bpp = gVesa_Modes[data->id].bpp; return 1; } + +void Vesa_int_HideCursor(void) +{ + DrvUtil_Video_RemoveCursor( &gVesa_BufInfo ); + #if BLINKING_CURSOR + if(giVesaCursorTimer != -1) { + Time_RemoveTimer(giVesaCursorTimer); + giVesaCursorTimer = -1; + } + #endif +} + +void Vesa_int_ShowCursor(void) +{ + gbVesa_CursorVisible = (giVesaCursorX >= 0); + if(gVesa_BufInfo.BufferFormat == VIDEO_BUFFMT_TEXT) + { + DrvUtil_Video_DrawCursor( + &gVesa_BufInfo, + giVesaCursorX*giVT_CharWidth, + giVesaCursorY*giVT_CharHeight + ); + #if BLINKING_CURSOR + giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, NULL); + #endif + } + else + DrvUtil_Video_DrawCursor( + &gVesa_BufInfo, + giVesaCursorX, + giVesaCursorY + ); +} + +/** + * \brief Swaps the text cursor on/off + */ +void Vesa_FlipCursor(void *Arg) +{ + if( gVesa_BufInfo.BufferFormat != VIDEO_BUFFMT_TEXT ) + return ; + + if( gbVesa_CursorVisible ) + DrvUtil_Video_RemoveCursor(&gVesa_BufInfo); + else + DrvUtil_Video_DrawCursor(&gVesa_BufInfo, + giVesaCursorX*giVT_CharWidth, + giVesaCursorY*giVT_CharHeight + ); + gbVesa_CursorVisible = !gbVesa_CursorVisible; + + #if BLINKING_CURSOR + giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg); + #endif +} +