X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FDisplay%2FTegra2Vid%2Fmain.c;h=21769bcefc72fcdf5cc6e9adcf4fbf5000e967a0;hb=e47f509e07718893b837826f981085829cf16c84;hp=34b58f11f760dcf571446cbb4493e3dea0efd3ff;hpb=be5123fe1f4aa66b76ce8ef589362ad21b6bbf72;p=tpg%2Facess2.git diff --git a/KernelLand/Modules/Display/Tegra2Vid/main.c b/KernelLand/Modules/Display/Tegra2Vid/main.c index 34b58f11..21769bce 100644 --- a/KernelLand/Modules/Display/Tegra2Vid/main.c +++ b/KernelLand/Modules/Display/Tegra2Vid/main.c @@ -24,8 +24,8 @@ void Tegra2Vid_Uninstall(); // Internal // Filesystem -size_t Tegra2Vid_Read(tVFS_Node *node, off_t off, size_t len, void *buffer); -size_t Tegra2Vid_Write(tVFS_Node *node, off_t off, size_t len, const void *buffer); +size_t Tegra2Vid_Read(tVFS_Node *node, off_t off, size_t len, void *buffer, Uint Flags); +size_t Tegra2Vid_Write(tVFS_Node *node, off_t off, size_t len, const void *buffer, Uint Flags); int Tegra2Vid_IOCtl(tVFS_Node *node, int id, void *data); // -- Internals int Tegra2Vid_int_SetMode(int Mode); @@ -98,7 +98,7 @@ int Tegra2Vid_Install(char **Arguments) gpTegra2Vid_IOMem = (void*)MM_MapHWPages(gTegra2Vid_PhysBase, 256/4); #if DUMP_REGISTERS - Tegra2Vid_int_DumpRegisters(); +// Tegra2Vid_int_DumpRegisters(); #endif // HACK!!! @@ -148,6 +148,7 @@ int Tegra2Vid_Install(char **Arguments) #endif gpTegra2Vid_Cursor = (void*)MM_AllocDMA(1, 26, NULL); + Log_Debug("Tegra2Vid", "gpTegra2Vid_Cursor = %p", gpTegra2Vid_Cursor); Tegra2Vid_int_SetMode(0); @@ -166,7 +167,7 @@ void Tegra2Vid_Uninstall() /** * \brief Read from the framebuffer */ -size_t Tegra2Vid_Read(tVFS_Node *node, off_t off, size_t len, void *buffer) +size_t Tegra2Vid_Read(tVFS_Node *node, off_t off, size_t len, void *buffer, Uint Flags) { return 0; } @@ -174,7 +175,7 @@ size_t Tegra2Vid_Read(tVFS_Node *node, off_t off, size_t len, void *buffer) /** * \brief Write to the framebuffer */ -size_t Tegra2Vid_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer) +size_t Tegra2Vid_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags) { gTegra2Vid_DrvUtil_BufInfo.BufferFormat = giTegra2Vid_BufferMode; return DrvUtil_Video_WriteLFB(&gTegra2Vid_DrvUtil_BufInfo, Offset, Length, Buffer); @@ -192,7 +193,7 @@ int Tegra2Vid_IOCtl(tVFS_Node *Node, int ID, void *Data) switch(ID) { - BASE_IOCTLS(DRV_TYPE_VIDEO, "PL110", VERSION, csaTegra2Vid_IOCtls); + BASE_IOCTLS(DRV_TYPE_VIDEO, "Tegra2", VERSION, csaTegra2Vid_IOCtls); case VIDEO_IOCTL_SETBUFFORMAT: DrvUtil_Video_RemoveCursor( &gTegra2Vid_DrvUtil_BufInfo );