Kernel/APIs - Moved buffer mode to FBInfo

diff --git a/Kernel/drvutil.c b/Kernel/drvutil.c
index 8908e7e..fb9a103 100644 (file)
--- a/Kernel/drvutil.c
+++ b/Kernel/drvutil.c
@@ -99,12 +99,12 @@ int DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
        return 0;
 }
 
-int DrvUtil_Video_WriteLFB(int Mode, tDrvUtil_Video_BufInfo *FBInfo, size_t Offset, size_t Length, void *Buffer)
+int DrvUtil_Video_WriteLFB(tDrvUtil_Video_BufInfo *FBInfo, size_t Offset, size_t Length, void *Buffer)
 {
        Uint8   *dest;
-       ENTER("iMode pFBInfo xOffset xLength pBuffer",
+       ENTER("pFBInfo xOffset xLength pBuffer",
                Mode, FBInfo, Offset, Length, Buffer);
-       switch( Mode )
+       switch( FBInfo->BufferFormat )
        {
        case VIDEO_BUFFMT_TEXT:
                {

diff --git a/Kernel/include/api_drv_common.h b/Kernel/include/api_drv_common.h
index 4e92c5f..59bef5f 100644 (file)
--- a/Kernel/include/api_drv_common.h
+++ b/Kernel/include/api_drv_common.h
@@ -75,7 +75,12 @@ enum eTplDrv_IOCtl {
         * of this driver's IOCtl calls by taking a string and returning the
         * IOCtl call number associated with that method name.
         */
-       DRV_IOCTL_LOOKUP
+       DRV_IOCTL_LOOKUP,
+
+       /**
+        * \brief First non-reserved IOCtl number for driver extension
+        */
+       DRV_IOCTL_USERMIN = 0x1000,
 };
 
 /**

diff --git a/Kernel/include/api_drv_video.h b/Kernel/include/api_drv_video.h
index b1abe59..1a5fe6a 100644 (file)
--- a/Kernel/include/api_drv_video.h
+++ b/Kernel/include/api_drv_video.h
@@ -4,8 +4,9 @@
  * \note For AcessOS Version 1\r
  * \r
  * Video drivers extend the common driver interface api_drv_common.h\r
- * and must support _at least_ the IOCtl numbers defined in this file\r
- * to be compatable with Acess.\r
+ * and must support the IOCtl numbers defined in this file to be\r
+ * compatable with Acess (drivers may implement more IOCtls above\r
+ * DRV_IOCTL_USERMIN).\r
  * \r
  * \section IOCtls\r
  * As said, a compatable driver must implement these calls correctly,\r
@@ -19,10 +20,9 @@
  * framebuffer.\r
  * \r
  * \section Mode Support\r
- * All video drivers must support at least one text mode (Mode #0)\r
- * For each graphics mode the driver exposes, there must be a corresponding\r
- * text mode with the same resolution, this mode will be used when the\r
- * user switches to a text Virtual Terminal while in graphics mode.\r
+ * All video drivers must support text output for every resolution (hardware\r
+ * accelerated or software), and at least the _BLIT and _FILL 2D operations\r
+ * (these may be implemented specifically for text mode).\r
  */\r
 #ifndef _API_DRV_VIDEO_H\r
 #define _API_DRV_VIDEO_H\r
@@ -317,6 +317,10 @@ extern Uint32      VT_Colour12toN(Uint16 Col12, int Depth);
  */\r
 typedef struct sDrvUtil_Video_BufInfo\r
 {\r
+       /**\r
+        * \name Framebuffer state\r
+        * \{\r
+        */\r
        /**\r
         * \brief Framebuffer virtual address\r
         */\r
@@ -336,7 +340,15 @@ typedef struct sDrvUtil_Video_BufInfo
        /**\r
         * \brief Bit depth of the framebuffer\r
         */\r
-        int    Depth;\r
+       short   Depth;\r
+       /*\r
+        * \}\r
+        */\r
+       \r
+       /**\r
+        * \brief Buffer write format\r
+        */\r
+       short   BufferFormat;\r
        \r
        /**\r
         * \name Software cursor controls\r
@@ -355,14 +367,14 @@ typedef struct sDrvUtil_Video_BufInfo
         * \brief Cursor bitmap\r
         */\r
        tVideo_IOCtl_Bitmap     *CursorBitmap;\r
+       /*\r
+        * \}\r
+        */\r
 \r
        /**\r
         * \brief Buffer to store the area under the cursor\r
         */\r
        void    *CursorSaveBuf;\r
-       /*\r
-        * \}\r
-        */\r
 } tDrvUtil_Video_BufInfo;\r
 \r
 /**\r
@@ -412,7 +424,6 @@ extern int  DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
 \r
 /**\r
  * \brief Perform write operations to a LFB\r
- * \param Mode Buffer mode (see eTplVideo_BufFormats)\r
  * \param FBInfo       Framebuffer descriptor, see type for details\r
  * \param Offset       Offset provided by VFS call\r
  * \param Length       Length provided by VFS call\r
@@ -422,7 +433,7 @@ extern int  DrvUtil_Video_2DStream(void *Ent, void *Buffer, int Length,
  * Handles all write modes in software, using the VT font calls for rendering.\r
  * \note Calls the cursor clear and redraw if the cursor area is touched\r
  */\r
-extern int     DrvUtil_Video_WriteLFB(int Mode, tDrvUtil_Video_BufInfo *FBInfo, size_t Offset, size_t Length, void *Src);\r
+extern int     DrvUtil_Video_WriteLFB(tDrvUtil_Video_BufInfo *FBInfo, size_t Offset, size_t Length, void *Src);\r
 \r
 /**\r
  * \name Software cursor rendering\r

diff --git a/Modules/Display/BochsGA/bochsvbe.c b/Modules/Display/BochsGA/bochsvbe.c
index 05d80ed..d9aada9 100644 (file)
--- a/Modules/Display/BochsGA/bochsvbe.c
+++ b/Modules/Display/BochsGA/bochsvbe.c
@@ -78,7 +78,6 @@ tDevFS_Driver gBGA_DriverStruct = {
        }\r
 };\r
  int   giBGA_CurrentMode = -1;\r
- int   giBGA_BufferFormat = 0;\r
 tVideo_IOCtl_Pos       gBGA_CursorPos = {-1,-1};\r
 Uint   *gBGA_Framebuffer;\r
 const tBGA_Mode        *gpBGA_CurrentMode;\r
@@ -120,7 +119,6 @@ int BGA_Install(char **Arguments)
 \r
        // Map Framebuffer to hardware address\r
        gBGA_Framebuffer = (void *) MM_MapHWPages(base, 768);   // 768 pages (3Mb)\r
-       MM_DumpTables(0, -1);\r
 \r
        // Install Device\r
        if( DevFS_AddDevice( &gBGA_DriverStruct ) == -1 )\r
@@ -165,7 +163,7 @@ Uint64 BGA_Read(tVFS_Node *node, Uint64 off, Uint64 len, void *buffer)
 Uint64 BGA_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r
 {\r
        if( giBGA_CurrentMode == -1 )   BGA_int_UpdateMode(0);\r
-       return DrvUtil_Video_WriteLFB(giBGA_BufferFormat, &gBGA_DrvUtil_BufInfo, Offset, Length, Buffer);\r
+       return DrvUtil_Video_WriteLFB(&gBGA_DrvUtil_BufInfo, Offset, Length, Buffer);\r
 }\r
 \r
 const char *csaBGA_IOCtls[] = {DRV_IOCTLNAMES, DRV_VIDEO_IOCTLNAMES, NULL};\r
@@ -195,9 +193,9 @@ int BGA_IOCtl(tVFS_Node *Node, int ID, void *Data)
                break;\r
        \r
        case VIDEO_IOCTL_SETBUFFORMAT:\r
-               ret = giBGA_BufferFormat;\r
+               ret = gBGA_DrvUtil_BufInfo.BufferFormat;\r
                if(Data)\r
-                       giBGA_BufferFormat = *(int*)Data;\r
+                       gBGA_DrvUtil_BufInfo.BufferFormat = *(int*)Data;\r
                break;\r
        \r
        case VIDEO_IOCTL_SETCURSOR:\r