From 747ab4fa12b47f4bda586d17090a81bf3173ce45 Mon Sep 17 00:00:00 2001 From: NicJA Date: Thu, 5 Jan 2017 07:29:22 +0000 Subject: [PATCH] wip prep commit in lieu of gfx subsystem update changes. # rename some files and constants/values for consistency and to ease cross developing on gfx drivers. # rename graphics.hidd to gfx.hidd to make a clear distinction from graphics.library subsystem (to prevent namespace collisions) and prevent using old code with the newer apis (todo) # expose graphics drivers as hardware devices, so that they can be enumerated by sysexplorer. # adapt all code to use the new gfx.hidd naming. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@53159 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- .../hidd/androidgfx/{akbd.c => android_kbdclass.c} | 8 +- .../{agfx_keyboard.h => android_keyboard.h} | 2 +- .../androidgfx/{agfx_mouse.h => android_mouse.h} | 2 +- .../androidgfx/{amouse.c => android_mouseclass.c} | 8 +- .../hidd/androidgfx/{server.c => android_server.c} | 10 +- .../hidd/androidgfx/{server.h => android_server.h} | 0 arch/all-android/hidd/androidgfx/androidgfx.conf | 20 +- .../{agfx_bitmap.h => androidgfx_bitmap.h} | 2 +- .../{abitmap.c => androidgfx_bitmapclass.c} | 10 +- .../hidd/androidgfx/{agfx.h => androidgfx_hidd.h} | 2 +- .../androidgfx/{agfx.c => androidgfx_hiddclass.c} | 6 +- .../{agfx_graphics.h => androidgfx_intern.h} | 4 +- arch/all-android/hidd/androidgfx/mmakefile.src | 2 +- arch/all-android/hidd/androidgfx/startup.c | 20 +- arch/all-hosted/hidd/sdl/event.c | 6 +- arch/all-hosted/hidd/sdl/mmakefile.src | 12 +- arch/all-hosted/hidd/sdl/sdl_intern.h | 24 +- .../hidd/sdl/{kbdclass.c => sdl_kbdclass.c} | 18 +- .../hidd/sdl/{mouseclass.c => sdl_mouseclass.c} | 22 +- .../hidd/sdl/{bmclass.c => sdlgfx_bitmapclass.c} | 4 +- .../hidd/sdl/{gfxclass.c => sdlgfx_hiddclass.c} | 4 +- arch/all-hosted/hidd/sdl/startup.c | 26 +- arch/all-hosted/hidd/x11/bitmap_class.h | 48 -- arch/all-hosted/hidd/x11/mmakefile.src | 17 +- arch/all-hosted/hidd/x11/x11.c | 18 +- arch/all-hosted/hidd/x11/x11.h | 18 +- arch/all-hosted/hidd/x11/x11_class.h | 2 +- .../hidd/x11/{x11clipboard.c => x11_clipboard.c} | 2 +- arch/all-hosted/hidd/x11/x11_init.c | 4 +- .../hidd/x11/{x11kbd.c => x11_kbdclass.c} | 4 +- .../hidd/x11/{x11mouse.c => x11_mouseclass.c} | 4 +- .../hidd/x11/{support.c => x11_support.c} | 14 +- arch/all-hosted/hidd/x11/{xshm.c => x11_xshm.c} | 4 +- arch/all-hosted/hidd/x11/{xshm.h => x11_xshm.h} | 2 +- arch/all-hosted/hidd/x11/x11gfx.conf | 8 +- .../hidd/x11/{bitmap.h => x11gfx_bitmap.h} | 4 +- .../x11/{bitmap_common.c => x11gfx_bitmapclass.c} | 20 +- arch/all-hosted/hidd/x11/x11gfx_bitmapclass.h | 48 ++ .../hidd/x11/{fullscreen.c => x11gfx_fullscreen.c} | 2 +- .../hidd/x11/{fullscreen.h => x11gfx_fullscreen.h} | 2 +- .../hidd/x11/{x11gfx.c => x11gfx_hiddclass.c} | 22 +- .../hidd/x11/{offbitmap.c => x11gfx_offbitmap.c} | 8 +- .../hidd/x11/{onbitmap.c => x11gfx_onbitmap.c} | 8 +- arch/all-hosted/libs/hostgl/hostgl_funcs.c | 8 +- .../libs/hostgl/hostgl_glacreatecontext.c | 4 +- .../libs/hostgl/hostgl_gladestroycontext.c | 4 +- arch/all-ios/hidd/uikit/gfxclass.h | 6 - arch/all-ios/hidd/uikit/mmakefile.src | 2 +- arch/all-ios/hidd/uikit/uikit.conf | 12 +- .../hidd/uikit/{bitmapclass.h => uikit_bitmap.h} | 0 .../uikit/{bitmapclass.c => uikit_bitmapclass.c} | 8 +- arch/all-ios/hidd/uikit/uikit_hidd.h | 6 + .../hidd/uikit/{gfxclass.c => uikit_hiddclass.c} | 8 +- .../hidd/uikit/{classbase.h => uikit_intern.h} | 0 arch/all-linux/hidd/linuxfb/bitmap.h | 10 - .../hidd/linuxfb/{linuxfb.conf => linuxfbgfx.conf} | 14 +- arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmap.h | 10 + .../{bmclass.c => linuxfbgfx_bitmapclass.c} | 20 +- .../linuxfb/{gfxclass.c => linuxfbgfx_hiddclass.c} | 20 +- .../linuxfb/{linuxfb_init.c => linuxfbgfx_init.c} | 12 +- .../{linuxfb_intern.h => linuxfbgfx_intern.h} | 18 +- .../linuxfb/{startup.c => linuxfbgfx_startup.c} | 2 +- arch/all-linux/hidd/linuxfb/mmakefile.src | 9 +- arch/all-mingw32/boot/AROSBootstrap.conf | 2 +- arch/all-mingw32/hidd/wingdi/gdi.h | 12 +- arch/all-mingw32/hidd/wingdi/mmakefile.src | 2 +- arch/all-mingw32/hidd/wingdi/startup.c | 2 +- arch/all-mingw32/hidd/wingdi/wingdi.conf | 12 +- .../hidd/wingdi/{bitmap.h => wingdi_bitmap.h} | 4 +- .../hidd/wingdi/{bitmap.c => wingdi_bitmapclass.c} | 30 +- .../hidd/wingdi/{gdi_class.h => wingdi_hidd.h} | 2 +- .../hidd/wingdi/{gdigfx.c => wingdi_hiddclass.c} | 8 +- .../hidd/wingdi/{gdikbd.c => wingdi_kbdclass.c} | 2 +- .../wingdi/{gdimouse.c => wingdi_mouseclass.c} | 2 +- arch/all-native/hidd/vga/mmakefile.src | 12 +- .../all-native/hidd/vga/{vgah.conf => vgagfx.conf} | 19 +- .../hidd/vga/{bitmap.h => vgagfx_bitmap.h} | 18 +- .../hidd/vga/{bitmap.c => vgagfx_bitmapclass.c} | 55 ++- .../hidd/vga/{vgaclass.h => vgagfx_hidd.h} | 16 +- .../hidd/vga/{vgaclass.c => vgagfx_hiddclass.c} | 50 +- .../hidd/vga/{vga_init.c => vgagfx_init.c} | 22 +- .../all-native/hidd/vga/{vga.h => vgagfx_intern.h} | 28 +- .../hidd/vga/{vgahw.c => vgagfx_support.c} | 16 +- .../hidd/vga/{vgahw.h => vgagfx_support.h} | 13 +- arch/all-unix/boot/AROSBootstrap.conf | 2 +- arch/all-unix/boot/AROSBootstrap_android.conf | 2 +- arch/all-unix/boot/AROSBootstrap_darwin.conf | 2 +- .../broadcom/2708/hidd/videocoregfx/mmakefile.src | 2 +- .../2708/hidd/videocoregfx/videocoregfx.conf | 2 +- .../2708/hidd/videocoregfx/videocoregfx_bitmap.h | 6 +- ..._bitmap_common.c => videocoregfx_bitmapclass.c} | 2 +- .../{videocoregfx_class.h => videocoregfx_hidd.h} | 6 +- ...deocoregfx_class.c => videocoregfx_hiddclass.c} | 6 +- .../2708/hidd/videocoregfx/videocoregfx_init.c | 10 +- .../2708/hidd/videocoregfx/videocoregfx_memory.c | 6 +- .../2708/hidd/videocoregfx/videocoregfx_onbitmap.c | 8 +- .../2708/hidd/videocoregfx/videocoregfx_pixfmts.c | 6 +- arch/i386-all/hidd/graphics/mmakefile.src | 6 +- arch/i386-all/hidd/graphics/rgbconv_arch.c | 4 +- arch/i386-pc/boot/mmakefile.src | 6 +- arch/m68k-amiga/boot/mmakefile.src | 6 +- arch/m68k-amiga/hidd/amigavideo/amigavideo.conf | 10 +- .../{amigavideobitmap.h => amigavideo_bitmap.h} | 12 +- ...amigavideobitmap.c => amigavideo_bitmapclass.c} | 12 +- .../{amigavideogfx.h => amigavideo_hidd.h} | 4 +- .../{amigavideogfx.c => amigavideo_hiddclass.c} | 22 +- .../{amigavideoclass.h => amigavideo_intern.h} | 2 +- arch/m68k-amiga/hidd/amigavideo/blitter.c | 8 +- arch/m68k-amiga/hidd/amigavideo/chipset.c | 8 +- arch/m68k-amiga/hidd/amigavideo/chipset.h | 2 +- arch/m68k-amiga/hidd/amigavideo/mmakefile.src | 2 +- arch/m68k-amiga/hidd/amigavideo/startup.c | 8 +- arch/m68k-amiga/hidd/graphics/mmakefile.src | 4 +- arch/m68k-amiga/hidd/graphics/rgbconv.c | 4 +- arch/m68k-amiga/hidd/uaegfx/mmakefile.src | 2 +- arch/m68k-amiga/hidd/uaegfx/startup.c | 6 +- arch/m68k-amiga/hidd/uaegfx/uaegfx.conf | 10 +- .../uaegfx/{uaegfxbitmap.h => uaegfx_bitmap.h} | 4 +- .../{uaegfxbitmap.c => uaegfx_bitmapclass.c} | 8 +- arch/m68k-amiga/hidd/uaegfx/uaegfx_hidd.h | 3 + .../hidd/uaegfx/{uaegfx.c => uaegfx_hiddclass.c} | 16 +- .../hidd/uaegfx/{uaegfx.h => uaegfx_intern.h} | 6 +- arch/m68k-amiga/hidd/uaegfx/uaegfxclass.h | 3 - arch/m68k-amiga/hidd/uaegfx/uaertg.c | 8 +- arch/ppc-chrp/hidd.radeon/radeon_bios.c | 4 +- arch/ppc-sam440/boot/menu.lst | 12 +- arch/ppc-sam440/boot/mmakefile.src | 2 +- arch/ppc-sam440/hidd.radeon/radeon_bios.c | 4 +- arch/x86_64-pc/boot/mmakefile.src | 2 +- boot/modular_kickstart.txt | 2 +- rom/graphics/adddisplaydrivera.c | 2 +- rom/graphics/allocspritedataa.c | 4 +- rom/graphics/bestmodeida.c | 4 +- rom/graphics/changevpbitmap.c | 4 +- rom/graphics/compositor_driver.h | 2 +- rom/graphics/dispinfo.c | 4 +- rom/graphics/fakegfxhidd.c | 4 +- rom/graphics/finddisplayinfo.c | 4 +- rom/graphics/freevportcoplists.c | 4 +- rom/graphics/getdisplayinfodata.c | 4 +- rom/graphics/getvpmodeid.c | 4 +- rom/graphics/gfxfuncsupport.h | 6 +- rom/graphics/graphics.conf | 2 +- rom/graphics/graphics_driver.c | 8 +- rom/graphics/graphics_init.c | 21 +- rom/graphics/graphics_intern.h | 17 +- rom/graphics/nextdisplayinfo.c | 4 +- rom/graphics/updatebitmap.c | 4 +- rom/hidds/graphics/OverlayClass.c | 12 +- rom/hidds/graphics/colorconv_init.c | 2 +- rom/hidds/graphics/{graphics.conf => gfx.conf} | 43 +- .../graphics/{BM_Class.c => gfx_bitmapclass.c} | 134 +++--- .../{convertpixels.c => gfx_bitmapconvertpixels.c} | 6 +- .../graphics/{memblit.c => gfx_bitmapmemblit.c} | 9 +- .../{chunkybm.c => gfx_chunkybitmapclass.c} | 13 +- .../graphics/{CM_Class.c => gfx_colormapclass.c} | 11 +- rom/hidds/graphics/gfx_debug.h | 18 + rom/hidds/graphics/{GC_Class.c => gfx_gcclass.c} | 32 +- .../graphics/{GraphicsClass.c => gfx_hiddclass.c} | 507 +++++---------------- rom/hidds/graphics/gfx_hwclass.c | 42 ++ rom/hidds/graphics/gfx_init.c | 340 ++++++++++++++ .../graphics/{graphics_intern.h => gfx_intern.h} | 48 +- rom/hidds/graphics/{pixfmt.c => gfx_pixfmtclass.c} | 11 +- .../{planarbm.c => gfx_planarbitmapclass.c} | 23 +- rom/hidds/graphics/{sync.c => gfx_syncclass.c} | 15 +- rom/hidds/graphics/graphics_init.c | 45 -- rom/hidds/graphics/include/{graphics.h => gfx.h} | 2 + rom/hidds/graphics/mmakefile.src | 22 +- rom/hidds/graphics/rgbconv.c | 4 +- rom/hidds/graphics/rgbconv_arch.c | 4 +- rom/hidds/vesa/mmakefile.src | 10 +- rom/hidds/vesa/vesagfx.conf | 20 +- .../bitmap.h => rom/hidds/vesa/vesagfx_bitmap.h | 15 +- rom/hidds/vesa/{bitmap.c => vesagfx_bitmapclass.c} | 53 ++- rom/hidds/vesa/{mouse.h => vesagfx_cursor.h} | 8 +- rom/hidds/vesa/vesagfx_hidd.h | 25 + .../vesa/{vesagfxclass.c => vesagfx_hiddclass.c} | 43 +- rom/hidds/vesa/vesagfx_init.c | 24 +- .../vesa/{vesagfxclass.h => vesagfx_intern.h} | 44 +- rom/hidds/vesa/{hardware.c => vesagfx_support.c} | 23 +- rom/hidds/vesa/{hardware.h => vesagfx_support.h} | 14 +- rom/intuition/inputhandler_support.c | 4 +- rom/intuition/intuition_init.c | 4 +- rom/intuition/intuition_misc.c | 4 +- rom/intuition/monitorclass.c | 4 +- rom/intuition/openscreen.c | 4 +- rom/intuition/pointerclass.c | 4 +- rom/intuition/screenclass.c | 4 +- rom/mmakefile.src | 9 +- test/cplusplus/headertest.cpp | 2 +- test/hidds/{graphics => gfx}/convertpixels.c | 4 +- test/hidds/{graphics => gfx}/hiddmodeid.c | 4 +- test/hidds/{graphics => gfx}/mmakefile.src | 2 +- test/hidds/{graphics => gfx}/modeid.c | 4 +- .../{graphics => gfx}/obsolete/BitMapNewDispose.c | 0 test/hidds/{graphics => gfx}/obsolete/GCCopyArea.c | 0 .../{graphics => gfx}/obsolete/GCDrawEllipse.c | 0 test/hidds/{graphics => gfx}/obsolete/GCDrawLine.c | 0 .../{graphics => gfx}/obsolete/GCDrawPolygon.c | 0 test/hidds/{graphics => gfx}/obsolete/GCDrawRect.c | 0 test/hidds/{graphics => gfx}/obsolete/GCDrawText.c | 0 .../{graphics => gfx}/obsolete/GCNewDispose.c | 0 .../obsolete/GCReadWritePixelDirect.c | 0 .../{graphics => gfx}/obsolete/GCWritePixel.c | 0 test/hidds/{graphics => gfx}/obsolete/ReadMe.txt | 0 .../hidds/{graphics => gfx}/obsolete/gfxhiddtool.c | 0 .../hidds/{graphics => gfx}/obsolete/gfxhiddtool.h | 0 .../hidds/{graphics => gfx}/obsolete/mmakefile.src | 0 workbench/c/Decoration/drawfuncs.c | 4 +- .../devs/monitors/Compositor/compositorclass.c | 2 +- .../devs/monitors/Compositor/include/compositor.h | 4 +- workbench/devs/monitors/IntelGMA/3D_blitter.c | 10 +- workbench/devs/monitors/IntelGMA/compositing.h | 2 +- .../{intelG45_bitmap.c => intelgma_bitmapclass.c} | 6 +- ...{compositing_intern.h => intelgma_compositor.h} | 2 +- ...mpositingclass.c => intelgma_compositorclass.c} | 6 +- .../{gallium_intern.h => intelgma_gallium.h} | 2 +- .../{galliumclass.c => intelgma_galliumclass.c} | 8 +- .../{intelG45_intern.h => intelgma_hidd.h} | 4 +- .../{intelG45_class.c => intelgma_hiddclass.c} | 8 +- .../{intelG45_i2c.c => intelgma_i2cclass.c} | 4 +- .../IntelGMA/{intelG45_init.c => intelgma_init.c} | 8 +- .../{intelG45_memory.c => intelgma_memory.c} | 4 +- .../IntelGMA/{startup.c => intelgma_startup.c} | 10 +- .../{intelG45_lowlevel.c => intelgma_support.c} | 6 +- .../IntelGMA/{aros_winsys.c => intelgma_winsys.c} | 6 +- .../IntelGMA/{aros_winsys.h => intelgma_winsys.h} | 0 workbench/devs/monitors/IntelGMA/mmakefile.src | 17 +- workbench/hidds/nouveau/compositor.h | 4 +- workbench/hidds/nouveau/mmakefile.src | 10 +- workbench/hidds/nouveau/nouveau.conf | 4 +- ...{nouveaubitmapclass.c => nouveau_bitmapclass.c} | 2 +- .../{compositor_intern.h => nouveau_compositor.h} | 2 +- ...compositorclass.c => nouveau_compositorclass.c} | 4 +- ...ouveaugalliumclass.c => nouveau_galliumclass.c} | 2 +- .../{nouveauclass.c => nouveau_hiddclass.c} | 2 +- .../nouveau/{nouveaui2c.c => nouveau_i2cclass.c} | 2 +- workbench/hidds/nouveau/nouveau_intern.h | 4 +- workbench/hidds/nvidia/nv.h | 4 +- workbench/hidds/nvidia/nvhardware.c | 4 +- workbench/hidds/nvidia/nvidia.conf | 2 +- workbench/hidds/nvidia/nvidia_init.c | 4 +- workbench/hidds/nvidia/nvidiabitmap.c | 4 +- workbench/hidds/nvidia/nvidiaclass.c | 4 +- workbench/hidds/nvidia/planarbm.c | 4 +- workbench/hidds/radeon/ati.h | 4 +- workbench/hidds/radeon/ati_bitmap.c | 4 +- workbench/hidds/radeon/ati_class.c | 4 +- workbench/hidds/radeon/ati_i2c.c | 2 +- workbench/hidds/radeon/ati_init.c | 6 +- workbench/hidds/radeon/bitmap.c | 2 +- workbench/hidds/radeon/planarbm.c | 4 +- workbench/hidds/radeon/radeon.conf | 2 +- workbench/hidds/radeon/radeon_accel.c | 2 +- workbench/hidds/radeon/radeon_bios.c | 4 +- workbench/hidds/radeon/radeon_driver.c | 2 +- workbench/hidds/sm502/mmakefile.src | 17 +- .../hidds/sm502/{sm502.conf => sm502gfx.conf} | 12 +- .../hidds/sm502/sm502gfx_bitmap.h | 12 +- .../sm502/{bitmap.c => sm502gfx_bitmapclass.c} | 40 +- .../hidds/sm502/{mouse.h => sm502gfx_cursor.h} | 8 +- .../sm502/{sm502gfxclass.h => sm502gfx_hidd.h} | 14 +- .../{sm502gfxclass.c => sm502gfx_hiddclass.c} | 24 +- .../hidds/sm502/{sm502_init.c => sm502gfx_init.c} | 20 +- .../hidds/sm502/{hardware.c => sm502gfx_support.c} | 38 +- .../hidds/sm502/{hardware.h => sm502gfx_support.h} | 10 +- workbench/hidds/vmwaresvga/vmwaresvga.conf | 2 +- workbench/hidds/vmwaresvga/vmwaresvga_init.c | 4 +- workbench/hidds/vmwaresvga/vmwaresvgabitmap.h | 4 +- workbench/hidds/vmwaresvga/vmwaresvgaclass.c | 4 +- workbench/hidds/vmwaresvga/vmwaresvgamouse.h | 2 +- workbench/hidds/vmwaresvga/vmwaresvgaoffbitmap.c | 4 +- workbench/hidds/vmwaresvga/vmwaresvgaonbitmap.c | 4 +- workbench/libs/cgfx/alloccmodelisttaglist.c | 4 +- workbench/libs/cgfx/blttemplatealpha.c | 4 +- workbench/libs/cgfx/cvideoctrltaglist.c | 4 +- workbench/libs/cgfx/cybergraphics_init.c | 7 +- workbench/libs/cgfx/docdrawmethodtaglist.c | 4 +- workbench/libs/cgfx/extractcolor.c | 4 +- workbench/libs/cgfx/fillpixelarray.c | 4 +- workbench/libs/cgfx/getcyberidattr.c | 4 +- workbench/libs/cgfx/getcybermapattr.c | 4 +- workbench/libs/cgfx/gfxfuncsupport.h | 4 +- workbench/libs/cgfx/invertpixelarray.c | 4 +- workbench/libs/cgfx/iscybermodeid.c | 4 +- workbench/libs/cgfx/lockbitmaptaglist.c | 4 +- workbench/libs/cgfx/movepixelarray.c | 4 +- workbench/libs/cgfx/processpixelarray_opblur.c | 4 +- .../libs/cgfx/processpixelarray_opbrightness.c | 4 +- workbench/libs/cgfx/processpixelarray_opcol2grey.c | 4 +- workbench/libs/cgfx/processpixelarray_opgradient.c | 4 +- workbench/libs/cgfx/processpixelarray_opnegative.c | 4 +- .../libs/cgfx/processpixelarray_opnegative_fade.c | 4 +- workbench/libs/cgfx/processpixelarray_opsetalpha.c | 4 +- workbench/libs/cgfx/processpixelarray_opshiftrgb.c | 4 +- workbench/libs/cgfx/processpixelarray_optint.c | 4 +- .../libs/cgfx/processpixelarray_optint_fade.c | 4 +- workbench/libs/cgfx/readpixelarray.c | 4 +- workbench/libs/cgfx/readrgbpixel.c | 4 +- workbench/libs/cgfx/scalepixelarray.c | 4 +- workbench/libs/cgfx/unlockbitmap.c | 4 +- workbench/libs/cgfx/unlockbitmaptaglist.c | 4 +- workbench/libs/cgfx/writelutpixelarray.c | 4 +- workbench/libs/cgfx/writepixelarray.c | 4 +- workbench/libs/cgfx/writepixelarrayalpha.c | 4 +- workbench/libs/cgfx/writergbpixel.c | 4 +- .../libs/cgxvideo/CreateVLayerHandleTagList.c | 4 +- workbench/libs/cgxvideo/DeleteVLayerHandle.c | 4 +- workbench/libs/cgxvideo/cgxvideo_init.c | 7 +- workbench/libs/gallium/bltpiperesourcerastport.c | 4 +- workbench/system/SysMon/video.c | 4 +- workbench/tools/SysExplorer/enum_gfx.c | 4 +- workbench/tools/SysExplorer/gfx_window_cl.c | 4 +- workbench/tools/SysExplorer/main.c | 4 +- 314 files changed, 1930 insertions(+), 1690 deletions(-) rename arch/all-android/hidd/androidgfx/{akbd.c => android_kbdclass.c} (98%) rename arch/all-android/hidd/androidgfx/{agfx_keyboard.h => android_keyboard.h} (77%) rename arch/all-android/hidd/androidgfx/{agfx_mouse.h => android_mouse.h} (87%) rename arch/all-android/hidd/androidgfx/{amouse.c => android_mouseclass.c} (97%) rename arch/all-android/hidd/androidgfx/{server.c => android_server.c} (96%) rename arch/all-android/hidd/androidgfx/{server.h => android_server.h} (100%) rename arch/all-android/hidd/androidgfx/{agfx_bitmap.h => androidgfx_bitmap.h} (91%) rename arch/all-android/hidd/androidgfx/{abitmap.c => androidgfx_bitmapclass.c} (96%) rename arch/all-android/hidd/androidgfx/{agfx.h => androidgfx_hidd.h} (95%) rename arch/all-android/hidd/androidgfx/{agfx.c => androidgfx_hiddclass.c} (98%) rename arch/all-android/hidd/androidgfx/{agfx_graphics.h => androidgfx_intern.h} (71%) rename arch/all-hosted/hidd/sdl/{kbdclass.c => sdl_kbdclass.c} (79%) rename arch/all-hosted/hidd/sdl/{mouseclass.c => sdl_mouseclass.c} (82%) rename arch/all-hosted/hidd/sdl/{bmclass.c => sdlgfx_bitmapclass.c} (99%) rename arch/all-hosted/hidd/sdl/{gfxclass.c => sdlgfx_hiddclass.c} (99%) delete mode 100644 arch/all-hosted/hidd/x11/bitmap_class.h rename arch/all-hosted/hidd/x11/{x11clipboard.c => x11_clipboard.c} (99%) rename arch/all-hosted/hidd/x11/{x11kbd.c => x11_kbdclass.c} (98%) rename arch/all-hosted/hidd/x11/{x11mouse.c => x11_mouseclass.c} (96%) rename arch/all-hosted/hidd/x11/{support.c => x11_support.c} (63%) rename arch/all-hosted/hidd/x11/{xshm.c => x11_xshm.c} (98%) rename arch/all-hosted/hidd/x11/{xshm.h => x11_xshm.h} (92%) rename arch/all-hosted/hidd/x11/{bitmap.h => x11gfx_bitmap.h} (95%) rename arch/all-hosted/hidd/x11/{bitmap_common.c => x11gfx_bitmapclass.c} (98%) create mode 100644 arch/all-hosted/hidd/x11/x11gfx_bitmapclass.h rename arch/all-hosted/hidd/x11/{fullscreen.c => x11gfx_fullscreen.c} (96%) rename arch/all-hosted/hidd/x11/{fullscreen.h => x11gfx_fullscreen.h} (75%) rename arch/all-hosted/hidd/x11/{x11gfx.c => x11gfx_hiddclass.c} (98%) rename arch/all-hosted/hidd/x11/{offbitmap.c => x11gfx_offbitmap.c} (93%) rename arch/all-hosted/hidd/x11/{onbitmap.c => x11gfx_onbitmap.c} (98%) delete mode 100644 arch/all-ios/hidd/uikit/gfxclass.h rename arch/all-ios/hidd/uikit/{bitmapclass.h => uikit_bitmap.h} (100%) rename arch/all-ios/hidd/uikit/{bitmapclass.c => uikit_bitmapclass.c} (97%) create mode 100644 arch/all-ios/hidd/uikit/uikit_hidd.h rename arch/all-ios/hidd/uikit/{gfxclass.c => uikit_hiddclass.c} (98%) rename arch/all-ios/hidd/uikit/{classbase.h => uikit_intern.h} (100%) delete mode 100644 arch/all-linux/hidd/linuxfb/bitmap.h rename arch/all-linux/hidd/linuxfb/{linuxfb.conf => linuxfbgfx.conf} (73%) create mode 100644 arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmap.h rename arch/all-linux/hidd/linuxfb/{bmclass.c => linuxfbgfx_bitmapclass.c} (74%) rename arch/all-linux/hidd/linuxfb/{gfxclass.c => linuxfbgfx_hiddclass.c} (96%) rename arch/all-linux/hidd/linuxfb/{linuxfb_init.c => linuxfbgfx_init.c} (82%) rename arch/all-linux/hidd/linuxfb/{linuxfb_intern.h => linuxfbgfx_intern.h} (88%) rename arch/all-linux/hidd/linuxfb/{startup.c => linuxfbgfx_startup.c} (97%) rename arch/all-mingw32/hidd/wingdi/{bitmap.h => wingdi_bitmap.h} (93%) rename arch/all-mingw32/hidd/wingdi/{bitmap.c => wingdi_bitmapclass.c} (95%) rename arch/all-mingw32/hidd/wingdi/{gdi_class.h => wingdi_hidd.h} (85%) rename arch/all-mingw32/hidd/wingdi/{gdigfx.c => wingdi_hiddclass.c} (99%) rename arch/all-mingw32/hidd/wingdi/{gdikbd.c => wingdi_kbdclass.c} (98%) rename arch/all-mingw32/hidd/wingdi/{gdimouse.c => wingdi_mouseclass.c} (98%) rename arch/all-native/hidd/vga/{vgah.conf => vgagfx.conf} (70%) rename arch/all-native/hidd/vga/{bitmap.h => vgagfx_bitmap.h} (84%) rename arch/all-native/hidd/vga/{bitmap.c => vgagfx_bitmapclass.c} (86%) rename arch/all-native/hidd/vga/{vgaclass.h => vgagfx_hidd.h} (79%) rename arch/all-native/hidd/vga/{vgaclass.c => vgagfx_hiddclass.c} (92%) rename arch/all-native/hidd/vga/{vga_init.c => vgagfx_init.c} (86%) rename arch/all-native/hidd/vga/{vga.h => vgagfx_intern.h} (71%) rename arch/all-native/hidd/vga/{vgahw.c => vgagfx_support.c} (98%) rename arch/all-native/hidd/vga/{vgahw.h => vgagfx_support.h} (91%) rename arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/{videocoregfx_bitmap_common.c => videocoregfx_bitmapclass.c} (98%) rename arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/{videocoregfx_class.h => videocoregfx_hidd.h} (94%) rename arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/{videocoregfx_class.c => videocoregfx_hiddclass.c} (98%) rename arch/m68k-amiga/hidd/amigavideo/{amigavideobitmap.h => amigavideo_bitmap.h} (67%) rename arch/m68k-amiga/hidd/amigavideo/{amigavideobitmap.c => amigavideo_bitmapclass.c} (98%) rename arch/m68k-amiga/hidd/amigavideo/{amigavideogfx.h => amigavideo_hidd.h} (96%) rename arch/m68k-amiga/hidd/amigavideo/{amigavideogfx.c => amigavideo_hiddclass.c} (97%) rename arch/m68k-amiga/hidd/amigavideo/{amigavideoclass.h => amigavideo_intern.h} (76%) rename arch/m68k-amiga/hidd/uaegfx/{uaegfxbitmap.h => uaegfx_bitmap.h} (86%) rename arch/m68k-amiga/hidd/uaegfx/{uaegfxbitmap.c => uaegfx_bitmapclass.c} (99%) create mode 100644 arch/m68k-amiga/hidd/uaegfx/uaegfx_hidd.h rename arch/m68k-amiga/hidd/uaegfx/{uaegfx.c => uaegfx_hiddclass.c} (99%) rename arch/m68k-amiga/hidd/uaegfx/{uaegfx.h => uaegfx_intern.h} (96%) delete mode 100644 arch/m68k-amiga/hidd/uaegfx/uaegfxclass.h rename rom/hidds/graphics/{graphics.conf => gfx.conf} (97%) rename rom/hidds/graphics/{BM_Class.c => gfx_bitmapclass.c} (98%) rename rom/hidds/graphics/{convertpixels.c => gfx_bitmapconvertpixels.c} (99%) rename rom/hidds/graphics/{memblit.c => gfx_bitmapmemblit.c} (99%) rename rom/hidds/graphics/{chunkybm.c => gfx_chunkybitmapclass.c} (99%) rename rom/hidds/graphics/{CM_Class.c => gfx_colormapclass.c} (98%) create mode 100644 rom/hidds/graphics/gfx_debug.h rename rom/hidds/graphics/{GC_Class.c => gfx_gcclass.c} (95%) rename rom/hidds/graphics/{GraphicsClass.c => gfx_hiddclass.c} (89%) create mode 100644 rom/hidds/graphics/gfx_hwclass.c create mode 100644 rom/hidds/graphics/gfx_init.c rename rom/hidds/graphics/{graphics_intern.h => gfx_intern.h} (89%) rename rom/hidds/graphics/{pixfmt.c => gfx_pixfmtclass.c} (96%) rename rom/hidds/graphics/{planarbm.c => gfx_planarbitmapclass.c} (97%) rename rom/hidds/graphics/{sync.c => gfx_syncclass.c} (98%) delete mode 100644 rom/hidds/graphics/graphics_init.c rename rom/hidds/graphics/include/{graphics.h => gfx.h} (99%) rename workbench/hidds/sm502/bitmap.h => rom/hidds/vesa/vesagfx_bitmap.h (72%) rename rom/hidds/vesa/{bitmap.c => vesagfx_bitmapclass.c} (75%) rename rom/hidds/vesa/{mouse.h => vesagfx_cursor.h} (55%) create mode 100644 rom/hidds/vesa/vesagfx_hidd.h rename rom/hidds/vesa/{vesagfxclass.c => vesagfx_hiddclass.c} (83%) rename rom/hidds/vesa/{vesagfxclass.h => vesagfx_intern.h} (61%) rename rom/hidds/vesa/{hardware.c => vesagfx_support.c} (92%) rename rom/hidds/vesa/{hardware.h => vesagfx_support.h} (73%) rename test/hidds/{graphics => gfx}/convertpixels.c (96%) rename test/hidds/{graphics => gfx}/hiddmodeid.c (96%) rename test/hidds/{graphics => gfx}/mmakefile.src (86%) rename test/hidds/{graphics => gfx}/modeid.c (97%) rename test/hidds/{graphics => gfx}/obsolete/BitMapNewDispose.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCCopyArea.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCDrawEllipse.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCDrawLine.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCDrawPolygon.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCDrawRect.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCDrawText.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCNewDispose.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCReadWritePixelDirect.c (100%) rename test/hidds/{graphics => gfx}/obsolete/GCWritePixel.c (100%) rename test/hidds/{graphics => gfx}/obsolete/ReadMe.txt (100%) rename test/hidds/{graphics => gfx}/obsolete/gfxhiddtool.c (100%) rename test/hidds/{graphics => gfx}/obsolete/gfxhiddtool.h (100%) rename test/hidds/{graphics => gfx}/obsolete/mmakefile.src (100%) rename workbench/devs/monitors/IntelGMA/{intelG45_bitmap.c => intelgma_bitmapclass.c} (99%) rename workbench/devs/monitors/IntelGMA/{compositing_intern.h => intelgma_compositor.h} (95%) rename workbench/devs/monitors/IntelGMA/{compositingclass.c => intelgma_compositorclass.c} (99%) rename workbench/devs/monitors/IntelGMA/{gallium_intern.h => intelgma_gallium.h} (80%) rename workbench/devs/monitors/IntelGMA/{galliumclass.c => intelgma_galliumclass.c} (97%) rename workbench/devs/monitors/IntelGMA/{intelG45_intern.h => intelgma_hidd.h} (99%) rename workbench/devs/monitors/IntelGMA/{intelG45_class.c => intelgma_hiddclass.c} (99%) rename workbench/devs/monitors/IntelGMA/{intelG45_i2c.c => intelgma_i2cclass.c} (95%) rename workbench/devs/monitors/IntelGMA/{intelG45_init.c => intelgma_init.c} (99%) rename workbench/devs/monitors/IntelGMA/{intelG45_memory.c => intelgma_memory.c} (98%) rename workbench/devs/monitors/IntelGMA/{startup.c => intelgma_startup.c} (97%) rename workbench/devs/monitors/IntelGMA/{intelG45_lowlevel.c => intelgma_support.c} (99%) rename workbench/devs/monitors/IntelGMA/{aros_winsys.c => intelgma_winsys.c} (99%) rename workbench/devs/monitors/IntelGMA/{aros_winsys.h => intelgma_winsys.h} (100%) rename workbench/hidds/nouveau/{nouveaubitmapclass.c => nouveau_bitmapclass.c} (99%) rename workbench/hidds/nouveau/{compositor_intern.h => nouveau_compositor.h} (97%) rename workbench/hidds/nouveau/{compositorclass.c => nouveau_compositorclass.c} (99%) rename workbench/hidds/nouveau/{nouveaugalliumclass.c => nouveau_galliumclass.c} (99%) rename workbench/hidds/nouveau/{nouveauclass.c => nouveau_hiddclass.c} (99%) rename workbench/hidds/nouveau/{nouveaui2c.c => nouveau_i2cclass.c} (95%) rename workbench/hidds/sm502/{sm502.conf => sm502gfx.conf} (77%) rename rom/hidds/vesa/bitmap.h => workbench/hidds/sm502/sm502gfx_bitmap.h (80%) rename workbench/hidds/sm502/{bitmap.c => sm502gfx_bitmapclass.c} (82%) rename workbench/hidds/sm502/{mouse.h => sm502gfx_cursor.h} (54%) rename workbench/hidds/sm502/{sm502gfxclass.h => sm502gfx_hidd.h} (86%) rename workbench/hidds/sm502/{sm502gfxclass.c => sm502gfx_hiddclass.c} (89%) rename workbench/hidds/sm502/{sm502_init.c => sm502gfx_init.c} (84%) rename workbench/hidds/sm502/{hardware.c => sm502gfx_support.c} (86%) rename workbench/hidds/sm502/{hardware.h => sm502gfx_support.h} (85%) diff --git a/arch/all-android/hidd/androidgfx/akbd.c b/arch/all-android/hidd/androidgfx/android_kbdclass.c similarity index 98% rename from arch/all-android/hidd/androidgfx/akbd.c rename to arch/all-android/hidd/androidgfx/android_kbdclass.c index 722719b895..cf189d23fe 100644 --- a/arch/all-android/hidd/androidgfx/akbd.c +++ b/arch/all-android/hidd/androidgfx/android_kbdclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Android keyboard hidd class. @@ -17,9 +17,9 @@ #include -#include "agfx.h" -#include "agfx_keyboard.h" -#include "server.h" +#include "androidgfx_hidd.h" +#include "android_keyboard.h" +#include "android_server.h" /****************************************************************************************/ diff --git a/arch/all-android/hidd/androidgfx/agfx_keyboard.h b/arch/all-android/hidd/androidgfx/android_keyboard.h similarity index 77% rename from arch/all-android/hidd/androidgfx/agfx_keyboard.h rename to arch/all-android/hidd/androidgfx/android_keyboard.h index ab3f317e96..8d81da535d 100644 --- a/arch/all-android/hidd/androidgfx/agfx_keyboard.h +++ b/arch/all-android/hidd/androidgfx/android_keyboard.h @@ -1,4 +1,4 @@ -#define CLID_Hidd_AKbd "hidd.kbd.android" +#define CLID_Hidd_Kbd_Android "hidd.kbd.android" struct kbd_data { diff --git a/arch/all-android/hidd/androidgfx/agfx_mouse.h b/arch/all-android/hidd/androidgfx/android_mouse.h similarity index 87% rename from arch/all-android/hidd/androidgfx/agfx_mouse.h rename to arch/all-android/hidd/androidgfx/android_mouse.h index 0a95c9707d..d8722faeb1 100644 --- a/arch/all-android/hidd/androidgfx/agfx_mouse.h +++ b/arch/all-android/hidd/androidgfx/android_mouse.h @@ -1,4 +1,4 @@ -#define CLID_Hidd_AMouse "hidd.mouse.android" +#define CLID_Hidd_Mouse_Android "hidd.mouse.android" struct mouse_data { diff --git a/arch/all-android/hidd/androidgfx/amouse.c b/arch/all-android/hidd/androidgfx/android_mouseclass.c similarity index 97% rename from arch/all-android/hidd/androidgfx/amouse.c rename to arch/all-android/hidd/androidgfx/android_mouseclass.c index d5b1f82a56..5031a9cb44 100644 --- a/arch/all-android/hidd/androidgfx/amouse.c +++ b/arch/all-android/hidd/androidgfx/android_mouseclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Android mouse input hidd class. @@ -14,9 +14,9 @@ #include -#include "agfx.h" -#include "agfx_mouse.h" -#include "server.h" +#include "androidgfx_hidd.h" +#include "android_mouse.h" +#include "android_server.h" OOP_Object *AMouse__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { diff --git a/arch/all-android/hidd/androidgfx/server.c b/arch/all-android/hidd/androidgfx/android_server.c similarity index 96% rename from arch/all-android/hidd/androidgfx/server.c rename to arch/all-android/hidd/androidgfx/android_server.c index d86e8e8f6d..fd3d96843e 100644 --- a/arch/all-android/hidd/androidgfx/server.c +++ b/arch/all-android/hidd/androidgfx/android_server.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -15,10 +15,10 @@ #include -#include "agfx.h" -#include "agfx_keyboard.h" -#include "agfx_mouse.h" -#include "server.h" +#include "androidgfx_hidd.h" +#include "android_keyboard.h" +#include "android_mouse.h" +#include "android_server.h" #undef XSD #define XSD(x) ((struct agfx_staticdata *)x) diff --git a/arch/all-android/hidd/androidgfx/server.h b/arch/all-android/hidd/androidgfx/android_server.h similarity index 100% rename from arch/all-android/hidd/androidgfx/server.h rename to arch/all-android/hidd/androidgfx/android_server.h diff --git a/arch/all-android/hidd/androidgfx/androidgfx.conf b/arch/all-android/hidd/androidgfx/androidgfx.conf index 3758789b3a..6c9744977e 100644 --- a/arch/all-android/hidd/androidgfx/androidgfx.conf +++ b/arch/all-android/hidd/androidgfx/androidgfx.conf @@ -2,9 +2,9 @@ basename AGFXCl libbase AGFXClBase libbasetype struct AGFXBase -version 42.1 +version 45.0 residentpri 9 -classid CLID_Hidd_AGfx +classid CLID_Hidd_Gfx_Android superclass CLID_Hidd_Gfx classptr_field xsd.gfxclass classdatatype struct gfx_data @@ -13,14 +13,14 @@ classdatatype struct gfx_data ##begin cdefprivate #define __OOP_NOATTRBASES__ -#include +#include #include -#include "agfx.h" -#include "agfx_bitmap.h" -#include "agfx_graphics.h" -#include "agfx_keyboard.h" -#include "agfx_mouse.h" +#include "androidgfx_hidd.h" +#include "androidgfx_bitmap.h" +#include "androidgfx_intern.h" +#include "android_keyboard.h" +#include "android_mouse.h" ##end cdefprivate @@ -56,7 +56,7 @@ UpdateRect ##begin config basename AMouse type hidd -classid CLID_Hidd_AMouse +classid CLID_Hidd_Mouse_Android superclass CLID_Hidd classptr_field xsd.mouseclass classdatatype struct mouse_data @@ -74,7 +74,7 @@ Get ##begin config basename AKbd type hidd -classid CLID_Hidd_AKbd +classid CLID_Hidd_Kbd_Android superclass CLID_Hidd classptr_field xsd.kbdclass classdatatype struct kbd_data diff --git a/arch/all-android/hidd/androidgfx/agfx_bitmap.h b/arch/all-android/hidd/androidgfx/androidgfx_bitmap.h similarity index 91% rename from arch/all-android/hidd/androidgfx/agfx_bitmap.h rename to arch/all-android/hidd/androidgfx/androidgfx_bitmap.h index 7edec6233c..8c737dc8ea 100644 --- a/arch/all-android/hidd/androidgfx/agfx_bitmap.h +++ b/arch/all-android/hidd/androidgfx/androidgfx_bitmap.h @@ -1,5 +1,5 @@ /* - Copyright 1995-2011, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Android bitmap class definitions diff --git a/arch/all-android/hidd/androidgfx/abitmap.c b/arch/all-android/hidd/androidgfx/androidgfx_bitmapclass.c similarity index 96% rename from arch/all-android/hidd/androidgfx/abitmap.c rename to arch/all-android/hidd/androidgfx/androidgfx_bitmapclass.c index dda2f7c2a2..ca32610141 100644 --- a/arch/all-android/hidd/androidgfx/abitmap.c +++ b/arch/all-android/hidd/androidgfx/androidgfx_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright 1995-2011, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Android bitmap class. @@ -14,15 +14,15 @@ #include #include -#include +#include #include #include #include #include -#include "agfx.h" -#include "agfx_bitmap.h" -#include "server.h" +#include "androidgfx_hidd.h" +#include "androidgfx_bitmap.h" +#include "android_server.h" /****************************************************************************************/ diff --git a/arch/all-android/hidd/androidgfx/agfx.h b/arch/all-android/hidd/androidgfx/androidgfx_hidd.h similarity index 95% rename from arch/all-android/hidd/androidgfx/agfx.h rename to arch/all-android/hidd/androidgfx/androidgfx_hidd.h index 87093b38cf..9e387e2e4c 100644 --- a/arch/all-android/hidd/androidgfx/agfx.h +++ b/arch/all-android/hidd/androidgfx/androidgfx_hidd.h @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Common data structures of androidgfx.hidd diff --git a/arch/all-android/hidd/androidgfx/agfx.c b/arch/all-android/hidd/androidgfx/androidgfx_hiddclass.c similarity index 98% rename from arch/all-android/hidd/androidgfx/agfx.c rename to arch/all-android/hidd/androidgfx/androidgfx_hiddclass.c index 76fffcb37b..8afbf992c8 100644 --- a/arch/all-android/hidd/androidgfx/agfx.c +++ b/arch/all-android/hidd/androidgfx/androidgfx_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Android-hosted graphics driver class. @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -30,7 +30,7 @@ #include LC_LIBDEFS_FILE -#include "server.h" +#include "android_server.h" OOP_Object *AGFXCl__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { diff --git a/arch/all-android/hidd/androidgfx/agfx_graphics.h b/arch/all-android/hidd/androidgfx/androidgfx_intern.h similarity index 71% rename from arch/all-android/hidd/androidgfx/agfx_graphics.h rename to arch/all-android/hidd/androidgfx/androidgfx_intern.h index 6fe4154418..2aabd8a590 100644 --- a/arch/all-android/hidd/androidgfx/agfx_graphics.h +++ b/arch/all-android/hidd/androidgfx/androidgfx_intern.h @@ -1,12 +1,12 @@ /* - Copyright 1995-2011, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Android bitmap class definitions Lang: English. */ -#define CLID_Hidd_AGfx "hidd.graphics.android" +#define CLID_Hidd_Gfx_Android "hidd.gfx.android" /* Private instance data for Gfx hidd class */ struct gfx_data diff --git a/arch/all-android/hidd/androidgfx/mmakefile.src b/arch/all-android/hidd/androidgfx/mmakefile.src index 12d899e61f..ebc45cf87c 100644 --- a/arch/all-android/hidd/androidgfx/mmakefile.src +++ b/arch/all-android/hidd/androidgfx/mmakefile.src @@ -6,7 +6,7 @@ include $(SRCDIR)/config/aros.cfg USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) -FILES := startup agfx abitmap akbd amouse server +FILES := startup androidgfx_hiddclass androidgfx_bitmap android_kbdclass android_mouseclass android_server %build_module mmake=kernel-hidd-androidgfx \ modname=androidgfx modtype=hidd \ diff --git a/arch/all-android/hidd/androidgfx/startup.c b/arch/all-android/hidd/androidgfx/startup.c index 8b54320003..a35e972953 100644 --- a/arch/all-android/hidd/androidgfx/startup.c +++ b/arch/all-android/hidd/androidgfx/startup.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -32,6 +32,20 @@ static int agfx_Startup(LIBBASETYPEPTR LIBBASE) { + struct TagItem kbd_tags[] = + { + {aHidd_Name , (IPTR)"AKbd" }, + {aHidd_HardwareName, (IPTR)"Android keyboard input"}, + {aHidd_ProducerName, (IPTR)"google" }, + {TAG_DONE , 0 } + }; + struct TagItem mouse_tags[] = + { + {aHidd_Name , (IPTR)"AMouse" }, + {aHidd_HardwareName, (IPTR)"Android pointer input"}, + {aHidd_ProducerName, (IPTR)"google" }, + {TAG_DONE , 0 } + }; struct GfxBase *GfxBase; OOP_Object *kbd, *ms; OOP_Object *kbdriver; @@ -53,10 +67,10 @@ static int agfx_Startup(LIBBASETYPEPTR LIBBASE) ms = OOP_NewObject(NULL, CLID_Hidd_Mouse, NULL); if (ms) { - kbdriver = HIDD_Kbd_AddHardwareDriver(kbd, LIBBASE->xsd.kbdclass, NULL); + kbdriver = HIDD_Kbd_AddHardwareDriver(kbd, LIBBASE->xsd.kbdclass, kbd_tags); if (kbdriver) { - msdriver = HIDD_Mouse_AddHardwareDriver(ms, LIBBASE->xsd.mouseclass, NULL); + msdriver = HIDD_Mouse_AddHardwareDriver(ms, LIBBASE->xsd.mouseclass, mouse_tags); if (!msdriver) HIDD_Kbd_RemHardwareDriver(kbd, kbdriver); } diff --git a/arch/all-hosted/hidd/sdl/event.c b/arch/all-hosted/hidd/sdl/event.c index e6ba935e79..c71f4c3817 100644 --- a/arch/all-hosted/hidd/sdl/event.c +++ b/arch/all-hosted/hidd/sdl/event.c @@ -1,7 +1,7 @@ /* * sdl.hidd - SDL graphics/sound/keyboard for AROS hosted * Copyright (c) 2007 Robert Norris. All rights reserved. - * Copyright (c) 2010 The AROS Development Team. All rights reserved. + * Copyright (c) 2010-2017 The AROS Development Team. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the same terms as AROS itself. @@ -92,7 +92,7 @@ VOID sdl_event_task(struct Task *creator, ULONG sync, LIBBASETYPEPTR LIBBASE) { D(bug("[sdl] got mouse event, sending to mouse hidd\n")); if (LIBBASE->mousehidd) - Hidd_SDLMouse_HandleEvent(LIBBASE->mousehidd, &e[i]); + Hidd_Mouse_SDL_HandleEvent(LIBBASE->mousehidd, &e[i]); } break; @@ -101,7 +101,7 @@ VOID sdl_event_task(struct Task *creator, ULONG sync, LIBBASETYPEPTR LIBBASE) { D(bug("[sdl] got keyboard event, sending to keyboard hidd\n")); if (LIBBASE->kbdhidd) - Hidd_SDLKbd_HandleEvent(LIBBASE->kbdhidd, &e[i]); + Hidd_Kbd_SDL_HandleEvent(LIBBASE->kbdhidd, &e[i]); break; } diff --git a/arch/all-hosted/hidd/sdl/mmakefile.src b/arch/all-hosted/hidd/sdl/mmakefile.src index 852c765f36..e2ce576a1a 100644 --- a/arch/all-hosted/hidd/sdl/mmakefile.src +++ b/arch/all-hosted/hidd/sdl/mmakefile.src @@ -2,7 +2,17 @@ include $(SRCDIR)/config/aros.cfg #MM- hidd-sdlgfx-yes : kernel-hidd-sdl -FILES := startup sdl_hostlib sdl_init event keymap gfxclass bmclass mouseclass kbdclass +FILES := \ + startup \ + sdl_hostlib \ + sdl_init \ + event \ + keymap \ + sdlgfx_hiddclass \ + sdlgfx_bitmapclass \ + sdl_mouseclass \ + sdl_kbdclass + EXEDIR := $(AROSDIR)/Storage/Monitors %build_prog mmake=kernel-hidd-sdl \ diff --git a/arch/all-hosted/hidd/sdl/sdl_intern.h b/arch/all-hosted/hidd/sdl/sdl_intern.h index 2e3ebd29d0..e5dc4194b2 100644 --- a/arch/all-hosted/hidd/sdl/sdl_intern.h +++ b/arch/all-hosted/hidd/sdl/sdl_intern.h @@ -15,13 +15,13 @@ #include #include #include -#include +#include #include #include "sdl_hostlib.h" -#define CLID_Hidd_SDLGfx "hidd.gfx.sdl" -#define IID_Hidd_SDLGFX "hidd.gfx.sdl" +#define CLID_Hidd_Gfx_SDL "hidd.gfx.sdl" +#define IID_Hidd_Gfx_SDL "hidd.gfx.sdl" struct gfxdata { @@ -29,7 +29,7 @@ struct gfxdata OOP_Object *framebuffer; /* Framebuffer bitmap object */ }; -#define IID_Hidd_SDLBitMap "hidd.bitmap.sdl" +#define IID_Hidd_BitMap_SDL "hidd.bitmap.sdl" enum { @@ -46,7 +46,7 @@ struct bmdata { BOOL is_onscreen; }; -#define IID_Hidd_SDLMouse "hidd.mouse.sdl" +#define IID_Hidd_Mouse_SDL "hidd.mouse.sdl" struct mousedata { VOID (*callback)(APTR, struct pHidd_Mouse_Event *); @@ -54,17 +54,17 @@ struct mousedata { }; enum { - moHidd_SDLMouse_HandleEvent + moHidd_Mouse_SDL_HandleEvent }; -struct pHidd_SDLMouse_HandleEvent { +struct pHidd_Mouse_SDL_HandleEvent { OOP_MethodID mID; SDL_Event *e; }; -VOID Hidd_SDLMouse_HandleEvent(OOP_Object *o, SDL_Event *e); +VOID Hidd_Mouse_SDL_HandleEvent(OOP_Object *o, SDL_Event *e); -#define IID_Hidd_SDLKbd "hidd.kbd.sdl" +#define IID_Hidd_Kbd_SDL "hidd.kbd.sdl" struct kbddata { VOID (*callback)(APTR, UWORD); @@ -72,15 +72,15 @@ struct kbddata { }; enum { - moHidd_SDLKbd_HandleEvent + moHidd_Kbd_SDL_HandleEvent }; -struct pHidd_SDLKbd_HandleEvent { +struct pHidd_Kbd_SDL_HandleEvent { OOP_MethodID mID; SDL_Event *e; }; -VOID Hidd_SDLKbd_HandleEvent(OOP_Object *o, SDL_Event *e); +VOID Hidd_Kbd_SDL_HandleEvent(OOP_Object *o, SDL_Event *e); struct sdlhidd { diff --git a/arch/all-hosted/hidd/sdl/kbdclass.c b/arch/all-hosted/hidd/sdl/sdl_kbdclass.c similarity index 79% rename from arch/all-hosted/hidd/sdl/kbdclass.c rename to arch/all-hosted/hidd/sdl/sdl_kbdclass.c index 80bf345e49..5fe7d5744c 100644 --- a/arch/all-hosted/hidd/sdl/kbdclass.c +++ b/arch/all-hosted/hidd/sdl/sdl_kbdclass.c @@ -1,7 +1,7 @@ /* * sdl.hidd - SDL graphics/sound/keyboard for AROS hosted * Copyright (c) 2007 Robert Norris. All rights reserved. - * Copyright (c) 2010 The AROS Development Team. All rights reserved. + * Copyright (c) 2010-2017 The AROS Development Team. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the same terms as AROS itself. @@ -54,7 +54,7 @@ OOP_Object *SDLKbd__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *ms return (OOP_Object *) o; } -VOID SDLKbd__Hidd_SDLKbd__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_SDLKbd_HandleEvent *msg) { +VOID SDLKbd__Hidd_Kbd_SDL__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_Kbd_SDL_HandleEvent *msg) { struct kbddata *kbddata = OOP_INST_DATA(cl, o); UWORD keycode; @@ -74,12 +74,12 @@ VOID SDLKbd__Hidd_SDLKbd__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd kbddata->callback(kbddata->callbackdata, keycode); } -VOID Hidd_SDLKbd_HandleEvent(OOP_Object *o, SDL_Event *e) { - struct pHidd_SDLKbd_HandleEvent msg; +VOID Hidd_Kbd_SDL_HandleEvent(OOP_Object *o, SDL_Event *e) { + struct pHidd_Kbd_SDL_HandleEvent msg; static OOP_MethodID mid; if (!mid) - mid = OOP_GetMethodID(IID_Hidd_SDLKbd, moHidd_SDLKbd_HandleEvent); + mid = OOP_GetMethodID(IID_Hidd_Kbd_SDL, moHidd_Kbd_SDL_HandleEvent); msg.mID = mid; msg.e = e; @@ -93,14 +93,14 @@ static struct OOP_MethodDescr SDLKbd_Root_descr[] = { }; #define NUM_SDLKbd_Root_METHODS 1 -static struct OOP_MethodDescr SDLKbd_Hidd_SDLKbd_descr[] = { - {(OOP_MethodFunc)SDLKbd__Hidd_SDLKbd__HandleEvent, moHidd_SDLKbd_HandleEvent}, +static struct OOP_MethodDescr SDLKbd_Hidd_Kbd_SDL_descr[] = { + {(OOP_MethodFunc)SDLKbd__Hidd_Kbd_SDL__HandleEvent, moHidd_Kbd_SDL_HandleEvent}, {NULL, 0} }; -#define NUM_SDLKbd_Hidd_SDLKbd_METHODS 1 +#define NUM_SDLKbd_Hidd_Kbd_SDL_METHODS 1 struct OOP_InterfaceDescr SDLKbd_ifdescr[] = { {SDLKbd_Root_descr , IID_Root , NUM_SDLKbd_Root_METHODS }, - {SDLKbd_Hidd_SDLKbd_descr, IID_Hidd_SDLKbd, NUM_SDLKbd_Hidd_SDLKbd_METHODS}, + {SDLKbd_Hidd_Kbd_SDL_descr, IID_Hidd_Kbd_SDL, NUM_SDLKbd_Hidd_Kbd_SDL_METHODS}, {NULL , NULL } }; diff --git a/arch/all-hosted/hidd/sdl/mouseclass.c b/arch/all-hosted/hidd/sdl/sdl_mouseclass.c similarity index 82% rename from arch/all-hosted/hidd/sdl/mouseclass.c rename to arch/all-hosted/hidd/sdl/sdl_mouseclass.c index 15382770f1..b949304762 100644 --- a/arch/all-hosted/hidd/sdl/mouseclass.c +++ b/arch/all-hosted/hidd/sdl/sdl_mouseclass.c @@ -1,7 +1,7 @@ /* * sdl.hidd - SDL graphics/sound/keyboard for AROS hosted * Copyright (c) 2007 Robert Norris. All rights reserved. - * Copyright (c) 2010 The AROS Development Team. All rights reserved. + * Copyright (c) 2010-2017 The AROS Development Team. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the same terms as AROS itself. @@ -53,7 +53,7 @@ OOP_Object *SDLMouse__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New * return (OOP_Object *) o; } -VOID SDLMouse__Hidd_SDLMouse__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_SDLMouse_HandleEvent *msg) { +VOID SDLMouse__Hidd_Mouse_SDL__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_Mouse_SDL_HandleEvent *msg) { struct mousedata *mousedata = OOP_INST_DATA(cl, o); struct pHidd_Mouse_Event hiddev; @@ -110,12 +110,12 @@ VOID SDLMouse__Hidd_SDLMouse__HandleEvent(OOP_Class *cl, OOP_Object *o, struct p } } -VOID Hidd_SDLMouse_HandleEvent(OOP_Object *o, SDL_Event *e) { - struct pHidd_SDLMouse_HandleEvent msg; +VOID Hidd_Mouse_SDL_HandleEvent(OOP_Object *o, SDL_Event *e) { + struct pHidd_Mouse_SDL_HandleEvent msg; static OOP_MethodID mid; if (!mid) - mid = OOP_GetMethodID(IID_Hidd_SDLMouse, moHidd_SDLMouse_HandleEvent); + mid = OOP_GetMethodID(IID_Hidd_Mouse_SDL, moHidd_Mouse_SDL_HandleEvent); msg.mID = mid; msg.e = e; @@ -127,16 +127,16 @@ static struct OOP_MethodDescr SDLMouse_Root_descr[] = { {(OOP_MethodFunc)SDLMouse__Root__New, moRoot_New}, {NULL , 0 } }; -#define NUM_SDLMouse_Root_METHODS 1 +#define NUM_Mouse_SDL_Root_METHODS 1 -static struct OOP_MethodDescr SDLMouse_Hidd_SDLMouse_descr[] = { - {(OOP_MethodFunc)SDLMouse__Hidd_SDLMouse__HandleEvent, moHidd_SDLMouse_HandleEvent}, +static struct OOP_MethodDescr SDLMouse_Hidd_Mouse_SDL_descr[] = { + {(OOP_MethodFunc)SDLMouse__Hidd_Mouse_SDL__HandleEvent, moHidd_Mouse_SDL_HandleEvent}, {NULL, 0} }; -#define NUM_SDLMouse_Hidd_SDLMouse_METHODS 1 +#define NUM_Mouse_SDL_Hidd_Mouse_SDL_METHODS 1 struct OOP_InterfaceDescr SDLMouse_ifdescr[] = { - {SDLMouse_Root_descr , IID_Root , NUM_SDLMouse_Root_METHODS }, - {SDLMouse_Hidd_SDLMouse_descr, IID_Hidd_SDLMouse, NUM_SDLMouse_Hidd_SDLMouse_METHODS}, + {SDLMouse_Root_descr , IID_Root , NUM_Mouse_SDL_Root_METHODS }, + {SDLMouse_Hidd_Mouse_SDL_descr, IID_Hidd_Mouse_SDL, NUM_Mouse_SDL_Hidd_Mouse_SDL_METHODS}, {NULL , NULL } }; diff --git a/arch/all-hosted/hidd/sdl/bmclass.c b/arch/all-hosted/hidd/sdl/sdlgfx_bitmapclass.c similarity index 99% rename from arch/all-hosted/hidd/sdl/bmclass.c rename to arch/all-hosted/hidd/sdl/sdlgfx_bitmapclass.c index b15d1bc2f4..cd7a3df525 100644 --- a/arch/all-hosted/hidd/sdl/bmclass.c +++ b/arch/all-hosted/hidd/sdl/sdlgfx_bitmapclass.c @@ -1,14 +1,14 @@ /* * sdl.hidd - SDL graphics/sound/keyboard for AROS hosted * Copyright (c) 2007 Robert Norris. All rights reserved. - * Copyright (c) 2010 The AROS Development Team. All rights reserved. + * Copyright (c) 2010-2017 The AROS Development Team. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the same terms as AROS itself. */ #include -#include +#include #include #include diff --git a/arch/all-hosted/hidd/sdl/gfxclass.c b/arch/all-hosted/hidd/sdl/sdlgfx_hiddclass.c similarity index 99% rename from arch/all-hosted/hidd/sdl/gfxclass.c rename to arch/all-hosted/hidd/sdl/sdlgfx_hiddclass.c index 7b3ec90746..eefe94edb3 100644 --- a/arch/all-hosted/hidd/sdl/gfxclass.c +++ b/arch/all-hosted/hidd/sdl/sdlgfx_hiddclass.c @@ -1,14 +1,14 @@ /* * sdl.hidd - SDL graphics/sound/keyboard for AROS hosted * Copyright (c) 2007 Robert Norris. All rights reserved. - * Copyright (c) 2010-2015 The AROS Development Team. All rights reserved. + * Copyright (c) 2010-2017 The AROS Development Team. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the same terms as AROS itself. */ #include -#include +#include #include #include diff --git a/arch/all-hosted/hidd/sdl/startup.c b/arch/all-hosted/hidd/sdl/startup.c index 7ba111c8e3..24abce53d6 100644 --- a/arch/all-hosted/hidd/sdl/startup.c +++ b/arch/all-hosted/hidd/sdl/startup.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ static struct OOP_ABDescr attrbases[] = { { IID_Hidd_ColorMap, &HiddColorMapAttrBase }, { IID_Hidd_Sync, &HiddSyncAttrBase }, { IID_Hidd_Gfx, &HiddGfxAttrBase }, - { IID_Hidd_SDLBitMap, &HiddSDLBitMapAttrBase }, + { IID_Hidd_BitMap_SDL, &HiddSDLBitMapAttrBase }, { IID_Hidd_Mouse, &HiddMouseAB }, { IID_Hidd_Kbd, &HiddKbdAB }, { NULL, NULL } @@ -62,6 +62,20 @@ struct sdlhidd xsd = {NULL}; static int sdl_Startup(struct sdlhidd *xsd) { + struct TagItem kbd_tags[] = + { + {aHidd_Name , (IPTR)"SDLKbd" }, + {aHidd_HardwareName, (IPTR)"SDL keyboard input"}, + {aHidd_ProducerName, (IPTR)"libsdl.org" }, + {TAG_DONE , 0 } + }; + struct TagItem mouse_tags[] = + { + {aHidd_Name , (IPTR)"SDLMouse" }, + {aHidd_HardwareName, (IPTR)"SDL pointer input"}, + {aHidd_ProducerName, (IPTR)"libsdl.org" }, + {TAG_DONE , 0 } + }; struct GfxBase *GfxBase; OOP_Object *kbd, *ms = NULL; OOP_Object *kbdriver = NULL; @@ -81,10 +95,10 @@ static int sdl_Startup(struct sdlhidd *xsd) if (kbd) { ms = OOP_NewObject(NULL, CLID_Hidd_Mouse, NULL); if (ms) { - kbdriver = HIDD_Kbd_AddHardwareDriver(kbd, xsd->kbdclass, NULL); + kbdriver = HIDD_Kbd_AddHardwareDriver(kbd, xsd->kbdclass, kbd_tags); D(bug("[SDL] Keyboard driver object 0x%p\n", kbdriver)); if (kbdriver) { - msdriver = HIDD_Mouse_AddHardwareDriver(ms, xsd->mouseclass, NULL); + msdriver = HIDD_Mouse_AddHardwareDriver(ms, xsd->mouseclass, mouse_tags); D(bug("[SDL] Mouse driver object 0x%p\n", msdriver)); } @@ -143,7 +157,7 @@ int main(void) /* If SDLGfx class is already registered, the user attempts to run us twice. Just ignore this. */ - if (OOP_FindClass(CLID_Hidd_SDLGfx)) { + if (OOP_FindClass(CLID_Hidd_Gfx_SDL)) { D(bug("[SDL] Driver already registered\n")); CloseLibrary(OOPBase); return RETURN_OK; @@ -201,7 +215,7 @@ int main(void) {aMeta_SuperID , (IPTR)CLID_Hidd_Gfx }, {aMeta_InterfaceDescr, (IPTR)SDLGfx_ifdescr }, {aMeta_InstSize , sizeof(struct gfxdata)}, - {aMeta_ID , (IPTR)CLID_Hidd_SDLGfx}, + {aMeta_ID , (IPTR)CLID_Hidd_Gfx_SDL}, {TAG_DONE , 0 } }; diff --git a/arch/all-hosted/hidd/x11/bitmap_class.h b/arch/all-hosted/hidd/x11/bitmap_class.h deleted file mode 100644 index 4e1e7ada03..0000000000 --- a/arch/all-hosted/hidd/x11/bitmap_class.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. - $Id$ - - Desc: X11 bitmap class, external definitions - Lang: english -*/ - -#ifndef _BITMAP_H -#define _BITMAP_H - -/* - * This attribute interface is common for both x11 onscreen and offscreen bitmap - * classes, although they don't have a common superclass - */ - -extern OOP_AttrBase HiddX11BitMapAB; - -/* extern OOP_AttrBase HiddX11BitMapAB; */ - -#define CLID_Hidd_BitMap_X11 "hidd.bitmap.x11" -#define IID_Hidd_BitMap_X11 "hidd.bitmap.x11" - -enum -{ - aoHidd_X11BitMap_Drawable, - aoHidd_X11BitMap_SysDisplay, - aoHidd_X11BitMap_SysScreen, - aoHidd_X11BitMap_GC, - aoHidd_X11BitMap_SysCursor, - aoHidd_X11BitMap_ColorMap, - aoHidd_X11BitMap_VisualClass, /* stegerg */ - - num_Hidd_X11BitMap_Attrs -}; - -#define aHidd_X11BitMap_Drawable (HiddX11BitMapAB + aoHidd_X11BitMap_Drawable) -#define aHidd_X11BitMap_SysDisplay (HiddX11BitMapAB + aoHidd_X11BitMap_SysDisplay) -#define aHidd_X11BitMap_SysScreen (HiddX11BitMapAB + aoHidd_X11BitMap_SysScreen) -#define aHidd_X11BitMap_GC (HiddX11BitMapAB + aoHidd_X11BitMap_GC) -#define aHidd_X11BitMap_SysCursor (HiddX11BitMapAB + aoHidd_X11BitMap_SysCursor) -#define aHidd_X11BitMap_ColorMap (HiddX11BitMapAB + aoHidd_X11BitMap_ColorMap) -#define aHidd_X11BitMap_VisualClass (HiddX11BitMapAB + aoHidd_X11BitMap_VisualClass) /* stegerg */ - -#define IS_BM_ATTR(attr, idx) ( ( (idx) = (attr) - HiddBitMapAttrBase) < num_Hidd_BitMap_Attrs) -#define IS_X11BM_ATTR(attr, idx) ( ( (idx) = (attr) - HiddX11BitMapAB) < num_Hidd_X11BitMap_Attrs) - -#endif diff --git a/arch/all-hosted/hidd/x11/mmakefile.src b/arch/all-hosted/hidd/x11/mmakefile.src index fe4bd50ae5..983cd33f50 100644 --- a/arch/all-hosted/hidd/x11/mmakefile.src +++ b/arch/all-hosted/hidd/x11/mmakefile.src @@ -32,8 +32,21 @@ X11KEYMAPTABLE_FILE := $(AROS_DEVS)/Keymaps/X11/keycode2rawkey.table X11KEYMAPTABLE_ALT_FILE := $(AROS_DEVS)/Keymaps/X11/keycode2rawkey-alt.table X11KEYMAPTABLE_ALT_NB_FILE := $(AROS_DEVS)/Keymaps/X11/keycode2rawkey-alt-nb.table -FILES := startup x11_hostlib x11_init x11 support x11gfx onbitmap offbitmap \ - x11kbd x11mouse x11clipboard xshm fullscreen bitmap_common +FILES := \ + startup \ + x11_hostlib \ + x11_init \ + x11 \ + x11_support \ + x11gfx_hiddclass \ + x11gfx_onbitmap \ + x11gfx_offbitmap \ + x11_kbdclass \ + x11_mouseclass \ + x11_clipboard \ + x11_xshm \ + x11gfx_fullscreen \ + x11gfx_bitmapclass #MM kernel-x11gfx : x11keymaptable devs-monitors-x11 #MM kernel-x11gfx-kobj : x11keymaptable devs-monitors-x11 diff --git a/arch/all-hosted/hidd/x11/x11.c b/arch/all-hosted/hidd/x11/x11.c index 4dd68c5900..393fc74eec 100644 --- a/arch/all-hosted/hidd/x11/x11.c +++ b/arch/all-hosted/hidd/x11/x11.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 hidd. Connects to the X server and receives events. @@ -16,7 +16,7 @@ #include "x11_types.h" #include "x11.h" #include "x11_hostlib.h" -#include "fullscreen.h" +#include "x11gfx_fullscreen.h" VOID X11BM_ExposeFB(APTR data, WORD x, WORD y, WORD width, WORD height); @@ -328,7 +328,7 @@ VOID x11task_entry(struct x11task_params *xtpparam) ObtainSemaphoreShared(&xsd->sema); if (xsd->kbdhidd) { - Hidd_X11Kbd_HandleEvent(xsd->kbdhidd, &keyrelease_event); + Hidd_Kbd_X11_HandleEvent(xsd->kbdhidd, &keyrelease_event); } ReleaseSemaphore(&xsd->sema); keyrelease_pending = FALSE; @@ -381,7 +381,7 @@ VOID x11task_entry(struct x11task_params *xtpparam) ObtainSemaphoreShared(&xsd->sema); if (xsd->kbdhidd) { - Hidd_X11Kbd_HandleEvent(xsd->kbdhidd, &keyrelease_event); + Hidd_Kbd_X11_HandleEvent(xsd->kbdhidd, &keyrelease_event); } ReleaseSemaphore(&xsd->sema); } @@ -490,7 +490,7 @@ VOID x11task_entry(struct x11task_params *xtpparam) ObtainSemaphoreShared(&xsd->sema); if (xsd->mousehidd) - Hidd_X11Mouse_HandleEvent(xsd->mousehidd, &event); + Hidd_Mouse_X11_HandleEvent(xsd->mousehidd, &event); ReleaseSemaphore(&xsd->sema); break; @@ -500,7 +500,7 @@ VOID x11task_entry(struct x11task_params *xtpparam) ObtainSemaphoreShared(&xsd->sema); if (xsd->mousehidd) - Hidd_X11Mouse_HandleEvent(xsd->mousehidd, &event); + Hidd_Mouse_X11_HandleEvent(xsd->mousehidd, &event); ReleaseSemaphore(&xsd->sema); break; @@ -510,7 +510,7 @@ VOID x11task_entry(struct x11task_params *xtpparam) ObtainSemaphoreShared(&xsd->sema); if (xsd->mousehidd) - Hidd_X11Mouse_HandleEvent(xsd->mousehidd, &event); + Hidd_Mouse_X11_HandleEvent(xsd->mousehidd, &event); ReleaseSemaphore(&xsd->sema); break; @@ -551,7 +551,7 @@ VOID x11task_entry(struct x11task_params *xtpparam) ObtainSemaphoreShared(&xsd->sema); if (xsd->kbdhidd) { - Hidd_X11Kbd_HandleEvent(xsd->kbdhidd, &event); + Hidd_Kbd_X11_HandleEvent(xsd->kbdhidd, &event); } ReleaseSemaphore(&xsd->sema); break; @@ -574,7 +574,7 @@ VOID x11task_entry(struct x11task_params *xtpparam) ObtainSemaphoreShared( &xsd->sema ); if (xsd->kbdhidd) { - Hidd_X11Kbd_HandleEvent(xsd->kbdhidd, &event); + Hidd_Kbd_X11_HandleEvent(xsd->kbdhidd, &event); } ReleaseSemaphore( &xsd->sema ); #endif diff --git a/arch/all-hosted/hidd/x11/x11.h b/arch/all-hosted/hidd/x11/x11.h index 25fb7fd381..d5997c68ad 100644 --- a/arch/all-hosted/hidd/x11/x11.h +++ b/arch/all-hosted/hidd/x11/x11.h @@ -2,7 +2,7 @@ #define HIDD_X11_H /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Include for the x11 HIDD. @@ -46,22 +46,22 @@ struct x11mouse_data }; /* IDs */ -#define IID_Hidd_X11Mouse "hidd.mouse.x11" +#define IID_Hidd_Mouse_X11 "hidd.mouse.x11" /* Methods */ enum { - moHidd_X11Mouse_HandleEvent + moHidd_Mouse_X11_HandleEvent }; -struct pHidd_X11Mouse_HandleEvent +struct pHidd_Mouse_X11_HandleEvent { OOP_MethodID mID; XEvent *event; }; -VOID Hidd_X11Mouse_HandleEvent(OOP_Object *o, XEvent *event); +VOID Hidd_Mouse_X11_HandleEvent(OOP_Object *o, XEvent *event); /***** X11Kbd HIDD *******************/ @@ -74,21 +74,21 @@ struct x11kbd_data }; /* IDs */ -#define IID_Hidd_X11Kbd "hidd.kbd.x11" +#define IID_Hidd_Kbd_X11 "hidd.kbd.x11" /* Methods */ enum { - moHidd_X11Kbd_HandleEvent + moHidd_Kbd_X11_HandleEvent }; -struct pHidd_X11Kbd_HandleEvent +struct pHidd_Kbd_X11_HandleEvent { OOP_MethodID mID; XEvent *event; }; -VOID Hidd_X11Kbd_HandleEvent(OOP_Object *o, XEvent *event); +VOID Hidd_Kbd_X11_HandleEvent(OOP_Object *o, XEvent *event); /* misc */ diff --git a/arch/all-hosted/hidd/x11/x11_class.h b/arch/all-hosted/hidd/x11/x11_class.h index a3fc6fb5b1..a88305111d 100644 --- a/arch/all-hosted/hidd/x11/x11_class.h +++ b/arch/all-hosted/hidd/x11/x11_class.h @@ -1,6 +1,6 @@ #define X11_LIBNAME "x11gfx.hidd" -#define CLID_Hidd_X11Gfx "hidd.gfx.x11" +#define CLID_Hidd_Gfx_X11 "hidd.gfx.x11" /* External part of library base */ struct X11Base diff --git a/arch/all-hosted/hidd/x11/x11clipboard.c b/arch/all-hosted/hidd/x11/x11_clipboard.c similarity index 99% rename from arch/all-hosted/hidd/x11/x11clipboard.c rename to arch/all-hosted/hidd/x11/x11_clipboard.c index 5e059c147b..8a762cb1e0 100644 --- a/arch/all-hosted/hidd/x11/x11clipboard.c +++ b/arch/all-hosted/hidd/x11/x11_clipboard.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 hidd. Host clipboard support. diff --git a/arch/all-hosted/hidd/x11/x11_init.c b/arch/all-hosted/hidd/x11/x11_init.c index 12a014808b..892c1b4e28 100644 --- a/arch/all-hosted/hidd/x11/x11_init.c +++ b/arch/all-hosted/hidd/x11/x11_init.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 hidd initialization code. @@ -16,7 +16,7 @@ #include "x11_types.h" #include LC_LIBDEFS_FILE #include "x11_hostlib.h" -#include "fullscreen.h" +#include "x11gfx_fullscreen.h" /****************************************************************************************/ diff --git a/arch/all-hosted/hidd/x11/x11kbd.c b/arch/all-hosted/hidd/x11/x11_kbdclass.c similarity index 98% rename from arch/all-hosted/hidd/x11/x11kbd.c rename to arch/all-hosted/hidd/x11/x11_kbdclass.c index 797eb1caea..266412239f 100644 --- a/arch/all-hosted/hidd/x11/x11kbd.c +++ b/arch/all-hosted/hidd/x11/x11_kbdclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 hidd handling keypresses. @@ -546,7 +546,7 @@ VOID X11Kbd__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) /****************************************************************************************/ -VOID X11Kbd__Hidd_X11Kbd__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_X11Kbd_HandleEvent *msg) +VOID X11Kbd__Hidd_Kbd_X11__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_Kbd_X11_HandleEvent *msg) { struct x11kbd_data *data; XKeyEvent *xk; diff --git a/arch/all-hosted/hidd/x11/x11mouse.c b/arch/all-hosted/hidd/x11/x11_mouseclass.c similarity index 96% rename from arch/all-hosted/hidd/x11/x11mouse.c rename to arch/all-hosted/hidd/x11/x11_mouseclass.c index 7485878f82..734cdb5d4b 100644 --- a/arch/all-hosted/hidd/x11/x11mouse.c +++ b/arch/all-hosted/hidd/x11/x11_mouseclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 hidd handling mouse events. @@ -120,7 +120,7 @@ VOID X11Mouse__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) /****************************************************************************************/ -VOID X11Mouse__Hidd_X11Mouse__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_X11Mouse_HandleEvent *msg) +VOID X11Mouse__Hidd_Mouse_X11__HandleEvent(OOP_Class *cl, OOP_Object *o, struct pHidd_Mouse_X11_HandleEvent *msg) { struct x11mouse_data *data = OOP_INST_DATA(cl, o); diff --git a/arch/all-hosted/hidd/x11/support.c b/arch/all-hosted/hidd/x11/x11_support.c similarity index 63% rename from arch/all-hosted/hidd/x11/support.c rename to arch/all-hosted/hidd/x11/x11_support.c index 0099342e54..79b01b614d 100644 --- a/arch/all-hosted/hidd/x11/support.c +++ b/arch/all-hosted/hidd/x11/x11_support.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 gfx HIDD for AROS. @@ -16,13 +16,13 @@ /****************************************************************************************/ -VOID Hidd_X11Mouse_HandleEvent(OOP_Object *o, XEvent *event) +VOID Hidd_Mouse_X11_HandleEvent(OOP_Object *o, XEvent *event) { - struct pHidd_X11Mouse_HandleEvent msg; + struct pHidd_Mouse_X11_HandleEvent msg; static OOP_MethodID mid; if (!mid) - mid = OOP_GetMethodID(IID_Hidd_X11Mouse, moHidd_X11Mouse_HandleEvent); + mid = OOP_GetMethodID(IID_Hidd_Mouse_X11, moHidd_Mouse_X11_HandleEvent); msg.mID = mid; msg.event = event; @@ -32,13 +32,13 @@ VOID Hidd_X11Mouse_HandleEvent(OOP_Object *o, XEvent *event) /****************************************************************************************/ -VOID Hidd_X11Kbd_HandleEvent(OOP_Object *o, XEvent *event) +VOID Hidd_Kbd_X11_HandleEvent(OOP_Object *o, XEvent *event) { - struct pHidd_X11Kbd_HandleEvent msg; + struct pHidd_Kbd_X11_HandleEvent msg; static OOP_MethodID mid; if (!mid) - mid = OOP_GetMethodID(IID_Hidd_X11Kbd, moHidd_X11Kbd_HandleEvent); + mid = OOP_GetMethodID(IID_Hidd_Kbd_X11, moHidd_Kbd_X11_HandleEvent); msg.mID = mid; msg.event = event; diff --git a/arch/all-hosted/hidd/x11/xshm.c b/arch/all-hosted/hidd/x11/x11_xshm.c similarity index 98% rename from arch/all-hosted/hidd/x11/xshm.c rename to arch/all-hosted/hidd/x11/x11_xshm.c index bd035695a3..44d3b59503 100644 --- a/arch/all-hosted/hidd/x11/xshm.c +++ b/arch/all-hosted/hidd/x11/x11_xshm.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -17,7 +17,7 @@ conflicts between AROS includes and system includes */ #include #include "x11_types.h" -#include "xshm.h" +#include "x11_xshm.h" /****************************************************************************************/ diff --git a/arch/all-hosted/hidd/x11/xshm.h b/arch/all-hosted/hidd/x11/x11_xshm.h similarity index 92% rename from arch/all-hosted/hidd/x11/xshm.h rename to arch/all-hosted/hidd/x11/x11_xshm.h index ae49cd5c58..4d882eb09b 100644 --- a/arch/all-hosted/hidd/x11/xshm.h +++ b/arch/all-hosted/hidd/x11/x11_xshm.h @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/arch/all-hosted/hidd/x11/x11gfx.conf b/arch/all-hosted/hidd/x11/x11gfx.conf index 10deb5dffd..0267960ee4 100644 --- a/arch/all-hosted/hidd/x11/x11gfx.conf +++ b/arch/all-hosted/hidd/x11/x11gfx.conf @@ -11,9 +11,9 @@ classdatatype struct gfx_data ##end config ##begin cdefprivate -#include +#include #include "x11.h" -#include "bitmap.h" +#include "x11gfx_bitmap.h" /* Avoid conflict with intuition and X11 definition of CurrentTime in the generated code */ #undef CurrentTime @@ -78,7 +78,7 @@ classdatatype struct x11mouse_data .interface Root New Dispose -.interface Hidd_X11Mouse +.interface Hidd_Mouse_X11 HandleEvent ##end methodlist ##end class @@ -97,7 +97,7 @@ classdatatype struct x11kbd_data .interface Root New Dispose -.interface Hidd_X11Kbd +.interface Hidd_Kbd_X11 HandleEvent ##end methodlist ##end class diff --git a/arch/all-hosted/hidd/x11/bitmap.h b/arch/all-hosted/hidd/x11/x11gfx_bitmap.h similarity index 95% rename from arch/all-hosted/hidd/x11/bitmap.h rename to arch/all-hosted/hidd/x11/x11gfx_bitmap.h index 40c24f7d7f..8b3fc7248f 100644 --- a/arch/all-hosted/hidd/x11/bitmap.h +++ b/arch/all-hosted/hidd/x11/x11gfx_bitmap.h @@ -1,12 +1,12 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 bitmap class, internal definitions Lang: english */ -#include "bitmap_class.h" +#include "x11gfx_bitmapclass.h" #define GetSysDisplay() (data->display) #define GetSysScreen() (data->screen) diff --git a/arch/all-hosted/hidd/x11/bitmap_common.c b/arch/all-hosted/hidd/x11/x11gfx_bitmapclass.c similarity index 98% rename from arch/all-hosted/hidd/x11/bitmap_common.c rename to arch/all-hosted/hidd/x11/x11gfx_bitmapclass.c index 172407aca4..827b3427ae 100644 --- a/arch/all-hosted/hidd/x11/bitmap_common.c +++ b/arch/all-hosted/hidd/x11/x11gfx_bitmapclass.c @@ -1,18 +1,18 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include "x11_debug.h" -#include +#include #include #include "x11_types.h" #include "x11.h" #include "x11_hostlib.h" -#include "bitmap.h" -#include "xshm.h" +#include "x11gfx_bitmap.h" +#include "x11_xshm.h" /****************************************************************************************/ @@ -57,10 +57,10 @@ OOP_Object *X11BM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg BOOL framebuffer; /* Get some info passed to us by the x11gfxhidd class */ - data->display = (Display *) GetTagData(aHidd_X11BitMap_SysDisplay, 0, msg->attrList); - data->screen = GetTagData(aHidd_X11BitMap_SysScreen, 0, msg->attrList); - data->cursor = (Cursor) GetTagData(aHidd_X11BitMap_SysCursor, 0, msg->attrList); - data->colmap = (Colormap) GetTagData(aHidd_X11BitMap_ColorMap, 0, msg->attrList); + data->display = (Display *) GetTagData(aHidd_BitMap_X11_SysDisplay, 0, msg->attrList); + data->screen = GetTagData(aHidd_BitMap_X11_SysScreen, 0, msg->attrList); + data->cursor = (Cursor) GetTagData(aHidd_BitMap_X11_SysCursor, 0, msg->attrList); + data->colmap = (Colormap) GetTagData(aHidd_BitMap_X11_ColorMap, 0, msg->attrList); framebuffer = GetTagData(aHidd_BitMap_FrameBuffer, FALSE, msg->attrList); D( @@ -1316,11 +1316,11 @@ VOID MNAME(Root__Get)(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { switch (idx) { - case aoHidd_X11BitMap_Drawable: + case aoHidd_BitMap_X11_Drawable: *msg->storage = (IPTR) DRAWABLE(data); return; - case aoHidd_X11BitMap_GC: + case aoHidd_BitMap_X11_GC: *msg->storage = (IPTR) data->gc; return; } diff --git a/arch/all-hosted/hidd/x11/x11gfx_bitmapclass.h b/arch/all-hosted/hidd/x11/x11gfx_bitmapclass.h new file mode 100644 index 0000000000..90650973b8 --- /dev/null +++ b/arch/all-hosted/hidd/x11/x11gfx_bitmapclass.h @@ -0,0 +1,48 @@ +/* + Copyright © 1995-2017, The AROS Development Team. All rights reserved. + $Id$ + + Desc: X11 bitmap class, external definitions + Lang: english +*/ + +#ifndef _BITMAP_H +#define _BITMAP_H + +/* + * This attribute interface is common for both x11 onscreen and offscreen bitmap + * classes, although they don't have a common superclass + */ + +extern OOP_AttrBase HiddX11BitMapAB; + +/* extern OOP_AttrBase HiddX11BitMapAB; */ + +#define CLID_Hidd_BitMap_X11 "hidd.bitmap.x11" +#define IID_Hidd_BitMap_X11 "hidd.bitmap.x11" + +enum +{ + aoHidd_BitMap_X11_Drawable, + aoHidd_BitMap_X11_SysDisplay, + aoHidd_BitMap_X11_SysScreen, + aoHidd_BitMap_X11_GC, + aoHidd_BitMap_X11_SysCursor, + aoHidd_BitMap_X11_ColorMap, + aoHidd_BitMap_X11_VisualClass, /* stegerg */ + + num_Hidd_BitMap_X11_Attrs +}; + +#define aHidd_BitMap_X11_Drawable (HiddX11BitMapAB + aoHidd_BitMap_X11_Drawable) +#define aHidd_BitMap_X11_SysDisplay (HiddX11BitMapAB + aoHidd_BitMap_X11_SysDisplay) +#define aHidd_BitMap_X11_SysScreen (HiddX11BitMapAB + aoHidd_BitMap_X11_SysScreen) +#define aHidd_BitMap_X11_GC (HiddX11BitMapAB + aoHidd_BitMap_X11_GC) +#define aHidd_BitMap_X11_SysCursor (HiddX11BitMapAB + aoHidd_BitMap_X11_SysCursor) +#define aHidd_BitMap_X11_ColorMap (HiddX11BitMapAB + aoHidd_BitMap_X11_ColorMap) +#define aHidd_BitMap_X11_VisualClass (HiddX11BitMapAB + aoHidd_BitMap_X11_VisualClass) /* stegerg */ + +#define IS_BM_ATTR(attr, idx) ( ( (idx) = (attr) - HiddBitMapAttrBase) < num_Hidd_BitMap_Attrs) +#define IS_X11BM_ATTR(attr, idx) ( ( (idx) = (attr) - HiddX11BitMapAB) < num_Hidd_BitMap_X11_Attrs) + +#endif diff --git a/arch/all-hosted/hidd/x11/fullscreen.c b/arch/all-hosted/hidd/x11/x11gfx_fullscreen.c similarity index 96% rename from arch/all-hosted/hidd/x11/fullscreen.c rename to arch/all-hosted/hidd/x11/x11gfx_fullscreen.c index 17d6a83dce..ec3d440979 100644 --- a/arch/all-hosted/hidd/x11/fullscreen.c +++ b/arch/all-hosted/hidd/x11/x11gfx_fullscreen.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Enable fullscreen mode. diff --git a/arch/all-hosted/hidd/x11/fullscreen.h b/arch/all-hosted/hidd/x11/x11gfx_fullscreen.h similarity index 75% rename from arch/all-hosted/hidd/x11/fullscreen.h rename to arch/all-hosted/hidd/x11/x11gfx_fullscreen.h index 26755d0b56..bbeeb3929e 100644 --- a/arch/all-hosted/hidd/x11/fullscreen.h +++ b/arch/all-hosted/hidd/x11/x11gfx_fullscreen.h @@ -1,5 +1,5 @@ /* - Copyright © 1995-2012, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Enable fullscreen mode. diff --git a/arch/all-hosted/hidd/x11/x11gfx.c b/arch/all-hosted/hidd/x11/x11gfx_hiddclass.c similarity index 98% rename from arch/all-hosted/hidd/x11/x11gfx.c rename to arch/all-hosted/hidd/x11/x11gfx_hiddclass.c index 75d26eef4a..4840ca79e6 100644 --- a/arch/all-hosted/hidd/x11/x11gfx.c +++ b/arch/all-hosted/hidd/x11/x11gfx_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: X11 gfx HIDD for AROS. @@ -18,13 +18,13 @@ #include "x11_types.h" #include LC_LIBDEFS_FILE #include "x11_hostlib.h" -#include "xshm.h" +#include "x11_xshm.h" #define XFLUSH(x) XCALL(XFlush, x) /****************************************************************************************/ -#define IS_X11GFX_ATTR(attr, idx) ( ( (idx) = (attr) - HiddX11GfxAB) < num_Hidd_X11BitMap_Attrs) +#define IS_X11GFX_ATTR(attr, idx) ( ( (idx) = (attr) - HiddX11GfxAB) < num_Hidd_BitMap_X11_Attrs) int xshm_major; @@ -500,11 +500,11 @@ OOP_Object *X11Cl__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct p struct gfx_data *data; struct TagItem tags[] = { - { aHidd_X11BitMap_SysDisplay , 0 }, /* 0 */ - { aHidd_X11BitMap_SysScreen , 0 }, /* 1 */ - { aHidd_X11BitMap_SysCursor , 0 }, /* 2 */ - { aHidd_X11BitMap_ColorMap , 0 }, /* 3 */ - { aHidd_X11BitMap_VisualClass , 0 }, /* 4 */ + { aHidd_BitMap_X11_SysDisplay , 0 }, /* 0 */ + { aHidd_BitMap_X11_SysScreen , 0 }, /* 1 */ + { aHidd_BitMap_X11_SysCursor , 0 }, /* 2 */ + { aHidd_BitMap_X11_ColorMap , 0 }, /* 3 */ + { aHidd_BitMap_X11_VisualClass , 0 }, /* 4 */ { TAG_IGNORE , 0 }, /* 5 */ { TAG_MORE , 0 } /* 6 */ }; @@ -620,8 +620,8 @@ VOID X11Cl__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Cop mode = GC_DRMD(msg->gc); - OOP_GetAttr(msg->src, aHidd_X11BitMap_Drawable, (IPTR *) &src); - OOP_GetAttr(msg->dest, aHidd_X11BitMap_Drawable, (IPTR *) &dest); + OOP_GetAttr(msg->src, aHidd_BitMap_X11_Drawable, (IPTR *) &src); + OOP_GetAttr(msg->dest, aHidd_BitMap_X11_Drawable, (IPTR *) &dest); if (0 == dest || 0 == src) { @@ -633,7 +633,7 @@ VOID X11Cl__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Cop return; } - OOP_GetAttr(msg->src, aHidd_X11BitMap_GC, (IPTR *) &gc); + OOP_GetAttr(msg->src, aHidd_BitMap_X11_GC, (IPTR *) &gc); HostLib_Lock(); diff --git a/arch/all-hosted/hidd/x11/offbitmap.c b/arch/all-hosted/hidd/x11/x11gfx_offbitmap.c similarity index 93% rename from arch/all-hosted/hidd/x11/offbitmap.c rename to arch/all-hosted/hidd/x11/x11gfx_offbitmap.c index 9cfd17ac6b..928996593a 100644 --- a/arch/all-hosted/hidd/x11/offbitmap.c +++ b/arch/all-hosted/hidd/x11/x11gfx_offbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Offscreen bitmap class for X11 hidd. @@ -11,12 +11,12 @@ #include "x11_debug.h" #include -#include +#include #include "x11_types.h" #include "x11.h" #include "x11_hostlib.h" -#include "bitmap.h" +#include "x11gfx_bitmap.h" /****************************************************************************************/ @@ -38,7 +38,7 @@ BOOL X11BM_InitPM(OOP_Class *cl, OOP_Object *o, struct TagItem *attrList) if (friend) { /* Get the X11 window from the friend bitmap */ - OOP_GetAttr(friend, aHidd_X11BitMap_Drawable, &friend_drawable); + OOP_GetAttr(friend, aHidd_BitMap_X11_Drawable, &friend_drawable); } if (!friend_drawable) diff --git a/arch/all-hosted/hidd/x11/onbitmap.c b/arch/all-hosted/hidd/x11/x11gfx_onbitmap.c similarity index 98% rename from arch/all-hosted/hidd/x11/onbitmap.c rename to arch/all-hosted/hidd/x11/x11gfx_onbitmap.c index 106406fd9f..ef817d01a0 100644 --- a/arch/all-hosted/hidd/x11/onbitmap.c +++ b/arch/all-hosted/hidd/x11/x11gfx_onbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Bitmap class for X11 hidd. @@ -8,13 +8,13 @@ #include "x11_debug.h" -#include +#include #include #include "x11_types.h" #include "x11.h" #include "x11_hostlib.h" -#include "bitmap.h" +#include "x11gfx_bitmap.h" /****************************************************************************************/ @@ -48,7 +48,7 @@ BOOL X11BM_InitFB(OOP_Class *cl, OOP_Object *o, struct TagItem *attrList) D(bug("[X11OnBm] %s()\n", __PRETTY_FUNCTION__)); /* stegerg */ - visualclass = GetTagData(aHidd_X11BitMap_VisualClass, TrueColor, attrList); + visualclass = GetTagData(aHidd_BitMap_X11_VisualClass, TrueColor, attrList); if (visualclass == PseudoColor) { Colormap cm; diff --git a/arch/all-hosted/libs/hostgl/hostgl_funcs.c b/arch/all-hosted/libs/hostgl/hostgl_funcs.c index e6ea75bfb2..b5f372117c 100644 --- a/arch/all-hosted/libs/hostgl/hostgl_funcs.c +++ b/arch/all-hosted/libs/hostgl/hostgl_funcs.c @@ -1,5 +1,5 @@ /* - Copyright 2011-2015, The AROS Development Team. All rights reserved. + Copyright 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -10,13 +10,13 @@ #include #include -#include +#include #include "hostgl_ctx_manager.h" #include "hostgl_funcs.h" #include "hostgl_support.h" -#include +#include #define SETFBATTR(attribute, value) \ { \ @@ -155,7 +155,7 @@ VOID HostGL_AllocatePixmap(struct hostgl_context *ctx) { if ((hiddbm = HIDD_BM_OBJ(ctx->glXPixmapBM))) { - OOP_GetAttr(hiddbm, aHidd_X11BitMap_Drawable, (IPTR *) &pixmap); + OOP_GetAttr(hiddbm, aHidd_BitMap_X11_Drawable, (IPTR *) &pixmap); ctx->glXPixmap = GLXCALL(glXCreateGLXPixmap, dsp, ctx->visinfo, pixmap); } diff --git a/arch/all-hosted/libs/hostgl/hostgl_glacreatecontext.c b/arch/all-hosted/libs/hostgl/hostgl_glacreatecontext.c index cd262e93ae..6ef54f72d3 100644 --- a/arch/all-hosted/libs/hostgl/hostgl_glacreatecontext.c +++ b/arch/all-hosted/libs/hostgl/hostgl_glacreatecontext.c @@ -1,5 +1,5 @@ /* - Copyright © 2011-2016, The AROS Development Team. All rights reserved. + Copyright © 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -14,7 +14,7 @@ #include "hostgl_funcs.h" #include "hostgl_support.h" -#include +#include /***************************************************************************** diff --git a/arch/all-hosted/libs/hostgl/hostgl_gladestroycontext.c b/arch/all-hosted/libs/hostgl/hostgl_gladestroycontext.c index 192492fd3a..2774a9430a 100644 --- a/arch/all-hosted/libs/hostgl/hostgl_gladestroycontext.c +++ b/arch/all-hosted/libs/hostgl/hostgl_gladestroycontext.c @@ -1,5 +1,5 @@ /* - Copyright 2011-2015, The AROS Development Team. All rights reserved. + Copyright 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -12,7 +12,7 @@ #include "hostgl_funcs.h" #include "hostgl_support.h" -#include +#include /***************************************************************************** diff --git a/arch/all-ios/hidd/uikit/gfxclass.h b/arch/all-ios/hidd/uikit/gfxclass.h deleted file mode 100644 index 5ea30225f0..0000000000 --- a/arch/all-ios/hidd/uikit/gfxclass.h +++ /dev/null @@ -1,6 +0,0 @@ -#define CLID_Hidd_UIKitGfx "hidd.graphics.uikit" - -struct gfx_data -{ - APTR display; -}; diff --git a/arch/all-ios/hidd/uikit/mmakefile.src b/arch/all-ios/hidd/uikit/mmakefile.src index 6194fa785f..e41eaf850b 100644 --- a/arch/all-ios/hidd/uikit/mmakefile.src +++ b/arch/all-ios/hidd/uikit/mmakefile.src @@ -7,7 +7,7 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-hidd-uikit-kobj: kernel-hidd-uikit-native #MM kernel-hidd-uikit-kobj-quick: kernel-hidd-uikit-native -FILES := gfxclass bitmapclass eventtask startup +FILES := uikit_hiddclass uikit_bitmapclass eventtask startup %build_module mmake=kernel-hidd-uikit \ modname=uikit modtype=hidd \ diff --git a/arch/all-ios/hidd/uikit/uikit.conf b/arch/all-ios/hidd/uikit/uikit.conf index 61b1992209..b3f5d0f7d9 100644 --- a/arch/all-ios/hidd/uikit/uikit.conf +++ b/arch/all-ios/hidd/uikit/uikit.conf @@ -2,9 +2,9 @@ basename UIKit libbase base libbasetype struct UIKitBase -version 42.1 +version 45.0 residentpri 9 -classid CLID_Hidd_UIKitGfx +classid CLID_Hidd_Gfx_UIKit superclass CLID_Hidd_Gfx classptr_field gfxclass classdatatype struct gfx_data @@ -13,12 +13,12 @@ classdatatype struct gfx_data ##begin cdefprivate #define __OOP_NOATTRBASES__ -#include +#include #include -#include "classbase.h" -#include "bitmapclass.h" -#include "gfxclass.h" +#include "uikit_intern.h" +#include "uikit_bitmap.h" +#include "uikit_hidd.h" ##end cdefprivate diff --git a/arch/all-ios/hidd/uikit/bitmapclass.h b/arch/all-ios/hidd/uikit/uikit_bitmap.h similarity index 100% rename from arch/all-ios/hidd/uikit/bitmapclass.h rename to arch/all-ios/hidd/uikit/uikit_bitmap.h diff --git a/arch/all-ios/hidd/uikit/bitmapclass.c b/arch/all-ios/hidd/uikit/uikit_bitmapclass.c similarity index 97% rename from arch/all-ios/hidd/uikit/bitmapclass.c rename to arch/all-ios/hidd/uikit/uikit_bitmapclass.c index f76bf174ac..303c07f296 100644 --- a/arch/all-ios/hidd/uikit/bitmapclass.c +++ b/arch/all-ios/hidd/uikit/uikit_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Quartz bitmap class. @@ -11,14 +11,14 @@ #define DUPD(x) #include -#include +#include #include #include #include #include -#include "classbase.h" -#include "bitmapclass.h" +#include "uikit_intern.h" +#include "uikit_bitmap.h" /****************************************************************************************/ diff --git a/arch/all-ios/hidd/uikit/uikit_hidd.h b/arch/all-ios/hidd/uikit/uikit_hidd.h new file mode 100644 index 0000000000..6bc49c3401 --- /dev/null +++ b/arch/all-ios/hidd/uikit/uikit_hidd.h @@ -0,0 +1,6 @@ +#define CLID_Hidd_Gfx_UIKit "hidd.gfx.uikit" + +struct gfx_data +{ + APTR display; +}; diff --git a/arch/all-ios/hidd/uikit/gfxclass.c b/arch/all-ios/hidd/uikit/uikit_hiddclass.c similarity index 98% rename from arch/all-ios/hidd/uikit/gfxclass.c rename to arch/all-ios/hidd/uikit/uikit_hiddclass.c index c5b0786a1d..5e1b5336bf 100644 --- a/arch/all-ios/hidd/uikit/gfxclass.c +++ b/arch/all-ios/hidd/uikit/uikit_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2016, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Cocoa Touch display HIDD for AROS @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,8 +21,8 @@ #include #include -#include "classbase.h" -#include "gfxclass.h" +#include "uikit_intern.h" +#include "uikit_hidd.h" /****************************************************************************************/ diff --git a/arch/all-ios/hidd/uikit/classbase.h b/arch/all-ios/hidd/uikit/uikit_intern.h similarity index 100% rename from arch/all-ios/hidd/uikit/classbase.h rename to arch/all-ios/hidd/uikit/uikit_intern.h diff --git a/arch/all-linux/hidd/linuxfb/bitmap.h b/arch/all-linux/hidd/linuxfb/bitmap.h deleted file mode 100644 index 9a8d88f707..0000000000 --- a/arch/all-linux/hidd/linuxfb/bitmap.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LXFB_BITMAP_H -#define LXFB_BITMAP_H - -struct BitmapData -{ - IPTR bpp; - int fbdev; -}; - -#endif diff --git a/arch/all-linux/hidd/linuxfb/linuxfb.conf b/arch/all-linux/hidd/linuxfb/linuxfbgfx.conf similarity index 73% rename from arch/all-linux/hidd/linuxfb/linuxfb.conf rename to arch/all-linux/hidd/linuxfb/linuxfbgfx.conf index 646ede6086..7097135daa 100644 --- a/arch/all-linux/hidd/linuxfb/linuxfb.conf +++ b/arch/all-linux/hidd/linuxfb/linuxfbgfx.conf @@ -1,18 +1,18 @@ ##begin config -basename LinuxFB +basename LinuxFBGfx libbase LinuxFBBase libbasetype struct LinuxFB_base -version 42.1 +version 45.0 residentpri 8 -classid CLID_Hidd_LinuxFB +classid CLID_Hidd_Gfx_LinuxFB superclass CLID_Hidd_Gfx classptr_field lsd.gfxclass classdatatype struct LinuxFB_data ##end config ##begin cdefprivate -#include "linuxfb_intern.h" -#include "bitmap.h" +#include "linuxfbgfx_intern.h" +#include "linuxfbgfx_bitmap.h" ##end cdefprivate ##begin methodlist @@ -27,11 +27,11 @@ SetGamma ##begin class ##begin config -basename LinuxBM +basename LinuxFBBM type hidd superclass CLID_Hidd_ChunkyBM classptr_field lsd.bmclass -classdatatype struct BitmapData +classdatatype struct LinuxFBBitMapData ##end config ##begin methodlist diff --git a/arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmap.h b/arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmap.h new file mode 100644 index 0000000000..eff3132cde --- /dev/null +++ b/arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmap.h @@ -0,0 +1,10 @@ +#ifndef LINUXFBGFX_BITMAP_H +#define LINUXFBGFX_BITMAP_H + +struct LinuxFBBitMapData +{ + IPTR bpp; + int fbdev; +}; + +#endif /* LINUXFBGFX_BITMAP_H */ diff --git a/arch/all-linux/hidd/linuxfb/bmclass.c b/arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmapclass.c similarity index 74% rename from arch/all-linux/hidd/linuxfb/bmclass.c rename to arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmapclass.c index c4e527b799..efd6799e89 100644 --- a/arch/all-linux/hidd/linuxfb/bmclass.c +++ b/arch/all-linux/hidd/linuxfb/linuxfbgfx_bitmapclass.c @@ -1,16 +1,16 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Onscreen bitmap class for linux fb device + Desc: Onscreen bitmap class for Linux FB Gfx Hidd Lang: English. */ #define DEBUG 0 - #include + #include -#include +#include #include #include #include @@ -20,19 +20,19 @@ #include #include -#include "linuxfb_intern.h" -#include "bitmap.h" +#include "linuxfbgfx_intern.h" +#include "linuxfbgfx_bitmap.h" /*********** BitMap::New() *************************************/ -OOP_Object *LinuxBM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +OOP_Object *LinuxFBBM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg) msg); D(bug("[LinuxBM] Created base bitmap %p\n", o)); if (NULL != o) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct LinuxFBBitMapData *data = OOP_INST_DATA(cl, o); OOP_Object *pf; data->fbdev = GetTagData(aHidd_LinuxFBBitmap_FBDevInfo, -1, msg->attrList); @@ -44,9 +44,9 @@ OOP_Object *LinuxBM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m return o; } -BOOL LinuxBM__Hidd_BitMap__SetColors(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetColors *msg) +BOOL LinuxFBBM__Hidd_BitMap__SetColors(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetColors *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct LinuxFBBitMapData *data = OOP_INST_DATA(cl, o); if ((msg->firstColor + msg->numColors) > (1 << (data->bpp))) { diff --git a/arch/all-linux/hidd/linuxfb/gfxclass.c b/arch/all-linux/hidd/linuxfb/linuxfbgfx_hiddclass.c similarity index 96% rename from arch/all-linux/hidd/linuxfb/gfxclass.c rename to arch/all-linux/hidd/linuxfb/linuxfbgfx_hiddclass.c index 6bc55eb2e1..b2f979df10 100644 --- a/arch/all-linux/hidd/linuxfb/gfxclass.c +++ b/arch/all-linux/hidd/linuxfb/linuxfbgfx_hiddclass.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Linux fbdev gfx HIDD for AROS. + Desc: Linux fbdev Gfx Hidd for AROS. Lang: English. */ @@ -26,14 +26,14 @@ #include #include #include -#include +#include #include #include #include #include -#include "linuxfb_intern.h" -#include "bitmap.h" +#include "linuxfbgfx_intern.h" +#include "linuxfbgfx_bitmap.h" #define CURSOR_IMAGE_BPP (4) @@ -62,7 +62,7 @@ static AROS_INTH1(ResetHandler, struct LinuxFB_data *, data) /***************** FBGfx::New() ***********************/ -OOP_Object *LinuxFB__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +OOP_Object *LinuxFBGfx__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { struct LinuxFB_staticdata *fsd = LSD(cl); struct fb_fix_screeninfo fsi; @@ -242,7 +242,7 @@ OOP_Object *LinuxFB__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m } /********** FBGfx::Dispose() ******************************/ -VOID LinuxFB__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) +VOID LinuxFBGfx__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { struct LinuxFB_data *data = OOP_INST_DATA(cl, o); @@ -252,7 +252,7 @@ VOID LinuxFB__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) OOP_DoSuperMethod(cl, o, msg); } -BOOL LinuxFB__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) +BOOL LinuxFBGfx__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { struct LinuxFB_data *data = OOP_INST_DATA(cl, o); ULONG idx; @@ -268,7 +268,7 @@ BOOL LinuxFB__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) } /********** FBGfx::CreateObject() ****************************/ -OOP_Object *LinuxFB__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) +OOP_Object *LinuxFBGfx__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) { struct LinuxFB_data *data = OOP_INST_DATA(cl, o); OOP_Object *object = NULL; @@ -334,7 +334,7 @@ OOP_Object *LinuxFB__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct return object; } -BOOL LinuxFB__Hidd_Gfx__SetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamma *msg) +BOOL LinuxFBGfx__Hidd_Gfx__SetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamma *msg) { struct LinuxFB_data *data = OOP_INST_DATA(cl, o); diff --git a/arch/all-linux/hidd/linuxfb/linuxfb_init.c b/arch/all-linux/hidd/linuxfb/linuxfbgfx_init.c similarity index 82% rename from arch/all-linux/hidd/linuxfb/linuxfb_init.c rename to arch/all-linux/hidd/linuxfb/linuxfbgfx_init.c index ae67d6ab3b..d89c2a412c 100644 --- a/arch/all-linux/hidd/linuxfb/linuxfb_init.c +++ b/arch/all-linux/hidd/linuxfb/linuxfbgfx_init.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: LinuxFB hidd initialization code. + Desc: LinuxFB Hidd initialization code. Lang: English. */ @@ -14,14 +14,14 @@ #include #include #include -#include +#include #include #include #include #include LC_LIBDEFS_FILE -#include "linuxfb_intern.h" +#include "linuxfbgfx_intern.h" static CONST_STRPTR const abd[] = { @@ -31,8 +31,8 @@ static CONST_STRPTR const abd[] = IID_Hidd_PixFmt, IID_Hidd_ColorMap, IID_Hidd_ChunkyBM, - IID_Hidd_LinuxFB, - IID_Hidd_LinuxFBBitmap, + IID_Hidd_Gfx_LinuxFB, + IID_Hidd_BitMap_LinuxFB, NULL }; diff --git a/arch/all-linux/hidd/linuxfb/linuxfb_intern.h b/arch/all-linux/hidd/linuxfb/linuxfbgfx_intern.h similarity index 88% rename from arch/all-linux/hidd/linuxfb/linuxfb_intern.h rename to arch/all-linux/hidd/linuxfb/linuxfbgfx_intern.h index ca364fa6fe..c5dd513b5b 100644 --- a/arch/all-linux/hidd/linuxfb/linuxfb_intern.h +++ b/arch/all-linux/hidd/linuxfb/linuxfbgfx_intern.h @@ -1,11 +1,11 @@ -#ifndef LINUX_INTERN_H -#define LINUX_INTERN_H +#ifndef LINUXFBGFX_INTERN_H +#define LINUXFBGFX_INTERN_H /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Linux framebuffer hidd for AROS + Desc: Linux FB Gfx Hidd private data Lang: English. */ @@ -13,7 +13,7 @@ #include #include #include -#include +#include /* hack: prevent linux include header to re-define timeval struct */ # define _STRUCT_TIMEVAL 1 @@ -23,8 +23,8 @@ /* Private Attrs and methods for the LinuxFB Hidd */ -#define CLID_Hidd_LinuxFB "hidd.gfx.linuxfb" -#define IID_Hidd_LinuxFB "hidd.gfx.linuxfb" +#define CLID_Hidd_Gfx_LinuxFB "hidd.gfx.linuxfb" +#define IID_Hidd_Gfx_LinuxFB "hidd.gfx.linuxfb" #define HiddLinuxFBAttrBase __abHidd_LinuxFB extern OOP_AttrBase HiddLinuxFBAttrBase; @@ -37,7 +37,7 @@ enum #define aHidd_LinuxFB_File HiddLinuxFBAttrBase + aoHidd_LinuxFB_File -#define IID_Hidd_LinuxFBBitmap "hidd.bitmap.linuxfb" +#define IID_Hidd_BitMap_LinuxFB "hidd.bitmap.linuxfb" #define HiddLinuxFBBitmapAttrBase __abHidd_LinuxFBBitmap extern OOP_AttrBase HiddLinuxFBBitmapAttrBase; @@ -131,4 +131,4 @@ struct BitmapData; #define METHOD(base, id, name) \ base ## __ ## id ## __ ## name (OOP_Class *cl, OOP_Object *o, struct p ## id ## _ ## name *msg) -#endif /* LINUX_INTERN_H */ +#endif /* LINUXFBGFX_INTERN_H */ diff --git a/arch/all-linux/hidd/linuxfb/startup.c b/arch/all-linux/hidd/linuxfb/linuxfbgfx_startup.c similarity index 97% rename from arch/all-linux/hidd/linuxfb/startup.c rename to arch/all-linux/hidd/linuxfb/linuxfbgfx_startup.c index ffc0e2d88b..c388faa2a4 100644 --- a/arch/all-linux/hidd/linuxfb/startup.c +++ b/arch/all-linux/hidd/linuxfb/linuxfbgfx_startup.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: gfx Hidd for linux framebuffer diff --git a/arch/all-linux/hidd/linuxfb/mmakefile.src b/arch/all-linux/hidd/linuxfb/mmakefile.src index 338f173790..2dc721068a 100644 --- a/arch/all-linux/hidd/linuxfb/mmakefile.src +++ b/arch/all-linux/hidd/linuxfb/mmakefile.src @@ -5,10 +5,15 @@ include $(SRCDIR)/config/aros.cfg USER_LDFLAGS = -static USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) -FILES := startup linuxfb_init gfxclass bmclass +FILES := \ + linuxfbgfx_startup \ + linuxfbgfx_init \ + linuxfbgfx_hiddclass \ + linuxfbgfx_bitmapclass + %build_module mmake=kernel-hidd-linuxfb \ - modname=linuxfb modtype=hidd \ + modname=linuxfbgfx modtype=hidd \ files=$(FILES) archspecific=yes %common diff --git a/arch/all-mingw32/boot/AROSBootstrap.conf b/arch/all-mingw32/boot/AROSBootstrap.conf index b1e32475ec..a35547c377 100644 --- a/arch/all-mingw32/boot/AROSBootstrap.conf +++ b/arch/all-mingw32/boot/AROSBootstrap.conf @@ -18,7 +18,7 @@ module Devs\lddemon.resource module Devs\input.device module Devs\keyboard.device -module Devs\Drivers\graphics.hidd +module Devs\Drivers\gfx.hidd module Devs\Drivers\hiddclass.hidd module Devs\Drivers\keyboard.hidd module Devs\Drivers\mouse.hidd diff --git a/arch/all-mingw32/hidd/wingdi/gdi.h b/arch/all-mingw32/hidd/wingdi/gdi.h index 321b27c99a..977d354766 100644 --- a/arch/all-mingw32/hidd/wingdi/gdi.h +++ b/arch/all-mingw32/hidd/wingdi/gdi.h @@ -2,7 +2,7 @@ #define HIDD_GDI_H /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Include for the gdi HIDD. @@ -47,7 +47,7 @@ struct GDI_Control #include #include "winapi.h" -#include "gdi_class.h" +#include "wingdi_hidd.h" #include "gdi_hostlib.h" /***** GDIMouse HIDD *******************/ @@ -63,8 +63,8 @@ struct gdimouse_data }; /* IDs */ -#define IID_Hidd_GDIMouse "hidd.mouse.gdi" -#define CLID_Hidd_GDIMouse "hidd.mouse.gdi" +#define IID_Hidd_Mouse_WinGDI "hidd.mouse.wingdi" +#define CLID_Hidd_Mouse_WinGDI "hidd.mouse.wingdi" /***** GDIKbd HIDD *******************/ @@ -77,8 +77,8 @@ struct gdikbd_data }; /* IDs */ -#define IID_Hidd_GDIKbd "hidd.kbd.gdi" -#define CLID_Hidd_GDIKbd "hidd.kbd.gdi" +#define IID_Hidd_Kbd_WinGDI "hidd.kbd.wingdi" +#define CLID_Hidd_Kbd_WinGDI "hidd.kbd.wingdi" /***** GDIGfx HIDD *******************/ diff --git a/arch/all-mingw32/hidd/wingdi/mmakefile.src b/arch/all-mingw32/hidd/wingdi/mmakefile.src index d3f926ca11..1eabc0e9c7 100644 --- a/arch/all-mingw32/hidd/wingdi/mmakefile.src +++ b/arch/all-mingw32/hidd/wingdi/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -FILES := startup gdi_hostlib gdigfx bitmap gdikbd gdimouse +FILES := startup gdi_hostlib wingdi_hiddclass wingdi_bitmapclass wingdi_kbdclass wingdi_mouseclass #MM kernel-hidd-wingdi-kobj : kernel-hidd-wingdi-native devs-monitors-gdi #MM kernel-hidd-wingdi : kernel-hidd-wingdi-native diff --git a/arch/all-mingw32/hidd/wingdi/startup.c b/arch/all-mingw32/hidd/wingdi/startup.c index d85e0685d4..8290b53435 100644 --- a/arch/all-mingw32/hidd/wingdi/startup.c +++ b/arch/all-mingw32/hidd/wingdi/startup.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/all-mingw32/hidd/wingdi/wingdi.conf b/arch/all-mingw32/hidd/wingdi/wingdi.conf index dc884445e0..2499e437ee 100644 --- a/arch/all-mingw32/hidd/wingdi/wingdi.conf +++ b/arch/all-mingw32/hidd/wingdi/wingdi.conf @@ -2,18 +2,18 @@ basename GDICl libbase GDIClBase libbasetype struct gdiclbase -version 42.1 +version 45.0 residentpri 9 -classid CLID_Hidd_GDIGfx +classid CLID_Hidd_Gfx_WinGDI superclass CLID_Hidd_Gfx classptr_field xsd.gfxclass classdatatype struct gfx_data ##end config ##begin cdefprivate -#include +#include #include "gdi.h" -#include "bitmap.h" +#include "wingdi_bitmap.h" ##end cdefprivate @@ -67,7 +67,7 @@ UpdateRect ##begin config basename GDIMouse type hidd -classid CLID_Hidd_GDIMouse +classid CLID_Hidd_Mouse_WinGDI superclass CLID_Hidd classptr_field xsd.mouseclass classdatatype struct gdimouse_data @@ -85,7 +85,7 @@ Dispose ##begin config basename GDIKbd type hidd -classid CLID_Hidd_GDIKbd +classid CLID_Hidd_Kbd_WinGDI superclass CLID_Hidd classptr_field xsd.kbdclass classdatatype struct gdikbd_data diff --git a/arch/all-mingw32/hidd/wingdi/bitmap.h b/arch/all-mingw32/hidd/wingdi/wingdi_bitmap.h similarity index 93% rename from arch/all-mingw32/hidd/wingdi/bitmap.h rename to arch/all-mingw32/hidd/wingdi/wingdi_bitmap.h index de557e042e..369a25d76f 100644 --- a/arch/all-mingw32/hidd/wingdi/bitmap.h +++ b/arch/all-mingw32/hidd/wingdi/wingdi_bitmap.h @@ -1,12 +1,12 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #ifndef _BITMAP_H #define _BITMAP_H -#define IID_Hidd_GDIBitMap "hidd.bitmap.gdibitmap" +#define IID_Hidd_BitMap_WinGDI "hidd.bitmap.wingdi" #define HiddGDIBitMapAB __abHidd_GDIBitMap diff --git a/arch/all-mingw32/hidd/wingdi/bitmap.c b/arch/all-mingw32/hidd/wingdi/wingdi_bitmapclass.c similarity index 95% rename from arch/all-mingw32/hidd/wingdi/bitmap.c rename to arch/all-mingw32/hidd/wingdi/wingdi_bitmapclass.c index 6cd2130756..de71c16ffe 100644 --- a/arch/all-mingw32/hidd/wingdi/bitmap.c +++ b/arch/all-mingw32/hidd/wingdi/wingdi_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Bitmap class for GDI hidd. @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #define SDEBUG 0 @@ -38,7 +38,7 @@ #include "gdi.h" -#include "bitmap.h" +#include "wingdi_bitmap.h" /****************************************************************************************/ @@ -62,7 +62,7 @@ static struct OOP_ABDescr attrbases[] = { IID_Hidd_Sync , &HiddSyncAttrBase }, { IID_Hidd_PixFmt , &HiddPixFmtAttrBase }, /* Private bases */ - { IID_Hidd_GDIBitMap, &HiddGDIBitMapAB }, + { IID_Hidd_BitMap_WinGDI, &HiddGDIBitMapAB }, { NULL , NULL } }; @@ -117,7 +117,7 @@ VOID GDIBM__Hidd_BitMap__PutPixel(OOP_Class *cl, OOP_Object *o, struct pHidd_Bit { struct bitmap_data *data = OOP_INST_DATA(cl, o); - DB2(bug("[GDI] hidd.bitmap.gdibitmap::PutPixel(0x%p): (%lu, %lu) = 0x%08lX\n", o, msg->x, msg->y, msg->pixel)); + DB2(bug("[WinGDI:BitMap] hidd.bitmap.gdibitmap::PutPixel(0x%p): (%lu, %lu) = 0x%08lX\n", o, msg->x, msg->y, msg->pixel)); Forbid(); GDICALL(SetROP2, data->dc, R2_COPYPEN); GDICALL(SetPixel, data->dc, msg->x, msg->y, msg->pixel); @@ -145,7 +145,7 @@ HIDDT_Pixel GDIBM__Hidd_BitMap__GetPixel(OOP_Class *cl, OOP_Object *o, struct pH static void FillRect(struct bitmap_data *data, ULONG col, ULONG mode, ULONG minX, ULONG minY, ULONG width, ULONG height) { APTR br, orig_br; - DB2(bug("[GDI] Brush color 0x%08lX, mode 0x%08lX\n", col, mode)); + DB2(bug("[WinGDI:BitMap] Brush color 0x%08lX, mode 0x%08lX\n", col, mode)); Forbid(); br = GDICALL(CreateSolidBrush, col); @@ -184,7 +184,7 @@ VOID GDIBM__Hidd_BitMap__FillRect(OOP_Class *cl, OOP_Object *o, struct pHidd_Bit ULONG col = GC_FG(msg->gc); ULONG mode = Fill_DrawModeTable[GC_DRMD(msg->gc)]; - D(bug("[GDI] hidd.bitmap.gdibitmap::FillRect(0x%p, %d,%d,%d,%d)\n", o, msg->minX, msg->minY, msg->maxX, msg->maxY)); + D(bug("[WinGDI:BitMap] hidd.bitmap.gdibitmap::FillRect(0x%p, %d,%d,%d,%d)\n", o, msg->minX, msg->minY, msg->maxX, msg->maxY)); FillRect(data, col, mode, msg->minX, msg->minY, msg->maxX - msg->minX + 1, msg->maxY - msg->minY + 1); CHECK_STACK } @@ -216,7 +216,7 @@ ULONG GDIBM__Hidd_BitMap__DrawPixel(OOP_Class *cl, OOP_Object *o, struct pHidd_B struct bitmap_data *data = OOP_INST_DATA(cl, o); ULONG col, mode; - DB2(bug("[GDI] hidd.bitmap.gdibitmap::DrawPixel(0x%p): (%lu, %lu)\n", o, msg->x, msg->y)); + DB2(bug("[WinGDI:BitMap] hidd.bitmap.gdibitmap::DrawPixel(0x%p): (%lu, %lu)\n", o, msg->x, msg->y)); col = GC_FG(msg->gc); mode = R2_DrawModeTable[GC_DRMD(msg->gc)]; @@ -529,22 +529,22 @@ OOP_Object *GDIBM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg OOP_Object *gfx = (OOP_Object *)attrs[AO(GfxHidd)]; OOP_Object *sync, *pixfmt; - D(bug("[GDI] Display driver object: 0x%p\n", gfx)); + D(bug("[WinGDI:BitMap] Display driver object: 0x%p\n", gfx)); HIDD_Gfx_GetMode(gfx, modeid, &sync, &pixfmt); OOP_GetAttr(sync, aHidd_Sync_HDisp, &win_width); OOP_GetAttr(sync, aHidd_Sync_VDisp, &win_height); - D(bug("[GDI] Display window size: %dx%d\n", win_width, win_height)); + D(bug("[WinGDI:BitMap] Display window size: %dx%d\n", win_width, win_height)); } Forbid(); my_dc = GDICALL(CreateCompatibleDC, display); - D(bug("[GDI] Memory device context: 0x%p\n", my_dc)); + D(bug("[WinGDI:BitMap] Memory device context: 0x%p\n", my_dc)); if (my_dc) { my_bitmap = GDICALL(CreateCompatibleBitmap, display, (width + 15) & ~15, height); - D(bug("[GDI] Memory bitmap: 0x%p\n", my_bitmap)); + D(bug("[WinGDI:BitMap] Memory bitmap: 0x%p\n", my_bitmap)); if (my_bitmap) orig_bitmap = GDICALL(SelectObject, my_dc, my_bitmap); - D(bug("[GDI] Olriginal DC bitmap: 0x%p\n", orig_bitmap)); + D(bug("[WinGDI:BitMap] Olriginal DC bitmap: 0x%p\n", orig_bitmap)); } Permit(); @@ -554,7 +554,7 @@ OOP_Object *GDIBM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg goto dispose_bitmap; o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg) msg); - D(bug("[GDI] Object created by superclass: 0x%p\n", o)); + D(bug("[WinGDI:BitMap] Object created by superclass: 0x%p\n", o)); if (o) { data = OOP_INST_DATA(cl, o); /* Get some info passed to us by the gdigfxhidd class */ @@ -619,7 +619,7 @@ VOID GDIBM__Hidd_BitMap__Clear(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap struct bitmap_data *data = OOP_INST_DATA(cl, o); IPTR width, height; - EnterFunc(bug("[GDI] hidd.bitmap.gdibitmap::Clear()\n")); + EnterFunc(bug("[WinGDI:BitMap] hidd.bitmap.gdibitmap::Clear()\n")); /* Get width & height from bitmap superclass */ diff --git a/arch/all-mingw32/hidd/wingdi/gdi_class.h b/arch/all-mingw32/hidd/wingdi/wingdi_hidd.h similarity index 85% rename from arch/all-mingw32/hidd/wingdi/gdi_class.h rename to arch/all-mingw32/hidd/wingdi/wingdi_hidd.h index db4f61edc8..f6fafad6d0 100644 --- a/arch/all-mingw32/hidd/wingdi/gdi_class.h +++ b/arch/all-mingw32/hidd/wingdi/wingdi_hidd.h @@ -2,7 +2,7 @@ #define GDI_LIBNAME "wingdi.hidd" -#define CLID_Hidd_GDIGfx "hidd.gfx.gdi" +#define CLID_Hidd_Gfx_WinGDI "hidd.gfx.wingdi" struct GDIBase { diff --git a/arch/all-mingw32/hidd/wingdi/gdigfx.c b/arch/all-mingw32/hidd/wingdi/wingdi_hiddclass.c similarity index 99% rename from arch/all-mingw32/hidd/wingdi/gdigfx.c rename to arch/all-mingw32/hidd/wingdi/wingdi_hiddclass.c index fdbdcef184..b24d61472c 100644 --- a/arch/all-mingw32/hidd/wingdi/gdigfx.c +++ b/arch/all-mingw32/hidd/wingdi/wingdi_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright 1995-2015, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: GDI gfx HIDD for AROS. @@ -23,12 +23,12 @@ #include #include -#include +#include #include #include "gdi.h" -#include "bitmap.h" +#include "wingdi_bitmap.h" #include LC_LIBDEFS_FILE @@ -71,7 +71,7 @@ OOP_AttrBase HiddAttrBase; static struct OOP_ABDescr attrbases[] = { { IID_Hidd_BitMap , &HiddBitMapAttrBase }, - { IID_Hidd_GDIBitMap, &HiddGDIBitMapAB }, + { IID_Hidd_BitMap_WinGDI, &HiddGDIBitMapAB }, { IID_Hidd_Sync , &HiddSyncAttrBase }, { IID_Hidd_PixFmt , &HiddPixFmtAttrBase }, { IID_Hidd_Gfx , &HiddGfxAttrBase }, diff --git a/arch/all-mingw32/hidd/wingdi/gdikbd.c b/arch/all-mingw32/hidd/wingdi/wingdi_kbdclass.c similarity index 98% rename from arch/all-mingw32/hidd/wingdi/gdikbd.c rename to arch/all-mingw32/hidd/wingdi/wingdi_kbdclass.c index 94a37c4b09..bab2ef2a00 100644 --- a/arch/all-mingw32/hidd/wingdi/gdikbd.c +++ b/arch/all-mingw32/hidd/wingdi/wingdi_kbdclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: GDI hidd handling keypresses. diff --git a/arch/all-mingw32/hidd/wingdi/gdimouse.c b/arch/all-mingw32/hidd/wingdi/wingdi_mouseclass.c similarity index 98% rename from arch/all-mingw32/hidd/wingdi/gdimouse.c rename to arch/all-mingw32/hidd/wingdi/wingdi_mouseclass.c index 334a3e7739..4b302dbed8 100644 --- a/arch/all-mingw32/hidd/wingdi/gdimouse.c +++ b/arch/all-mingw32/hidd/wingdi/wingdi_mouseclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: GDI hidd handling mouse events. diff --git a/arch/all-native/hidd/vga/mmakefile.src b/arch/all-native/hidd/vga/mmakefile.src index feb6ae217e..aa946c186b 100644 --- a/arch/all-native/hidd/vga/mmakefile.src +++ b/arch/all-native/hidd/vga/mmakefile.src @@ -2,12 +2,18 @@ include $(SRCDIR)/config/aros.cfg -FILES := vga_init vgaclass vgahw bitmap +#MM kernel-hidd-vgagfx : kernel-hidd-gfx-includes + +FILES := \ + vgagfx_init \ + vgagfx_hiddclass \ + vgagfx_support \ + vgagfx_bitmapclass USER_LDFLAGS := -static -%build_module mmake=kernel-hidd-vga \ - modname=vgah modtype=hidd \ +%build_module mmake=kernel-hidd-vgagfx \ + modname=vgagfx modtype=hidd \ files=$(FILES) uselibs=acpica %common diff --git a/arch/all-native/hidd/vga/vgah.conf b/arch/all-native/hidd/vga/vgagfx.conf similarity index 70% rename from arch/all-native/hidd/vga/vgah.conf rename to arch/all-native/hidd/vga/vgagfx.conf index 06092c50ec..fc24246ea5 100644 --- a/arch/all-native/hidd/vga/vgah.conf +++ b/arch/all-native/hidd/vga/vgagfx.conf @@ -1,18 +1,19 @@ ##begin config -basename PCVGA -libbasetype struct vgabase -version 42.1 +basename VGAGfx +libbasetype struct VGAGfxBase +version 45.0 residentpri 8 classptr_field vsd.vgaclass -classdatatype struct Vga_Data +classdatatype struct VGAGfxDriverData classid CLID_Hidd_Gfx_VGA superclass CLID_Hidd_Gfx ##end config ##begin cdefprivate -#include "vga.h" -#include "vgaclass.h" -#include "bitmap.h" +#include +#include "vgagfx_intern.h" +#include "vgagfx_hidd.h" +#include "vgagfx_bitmap.h" ##end cdefprivate ##begin methodlist @@ -31,12 +32,12 @@ SetCursorVisible ##begin class ##begin config -basename PCVGABM +basename VGAGfxBM type hidd classptr_field vsd.bmclass classid CLID_Hidd_BitMap_VGA superclass CLID_Hidd_ChunkyBM -classdatatype struct bitmap_data +classdatatype struct VGAGfxBitMapData ##end config ##begin methodlist diff --git a/arch/all-native/hidd/vga/bitmap.h b/arch/all-native/hidd/vga/vgagfx_bitmap.h similarity index 84% rename from arch/all-native/hidd/vga/bitmap.h rename to arch/all-native/hidd/vga/vgagfx_bitmap.h index 57fef97922..789ecdbee1 100644 --- a/arch/all-native/hidd/vga/bitmap.h +++ b/arch/all-native/hidd/vga/vgagfx_bitmap.h @@ -3,11 +3,11 @@ $Id$ */ -#ifndef _BITMAP_H -#define _BITMAP_H +#ifndef VGAGFX_BITMAP_H +#define VGAGFX_BITMAP_H -#include "vgahw.h" -#include +#include "vgagfx_support.h" +#include /* This attribute interface is common for both vga onscreen and offscreen bitmap @@ -41,7 +41,7 @@ enum { onbitmap and offbitmap classes. */ -struct bitmap_data +struct VGAGfxBitMapData { struct vgaHWRec *Regs; /* Registers */ unsigned char *VideoData; /* Pointing to video data */ @@ -68,8 +68,8 @@ VOID bitmap_putpixel(OOP_Class *, OOP_Object *, struct pHidd_BitMap_PutPixel *); HIDDT_Pixel bitmap_getpixel(OOP_Class *, OOP_Object *, struct pHidd_BitMap_GetPixel *); ULONG bitmap_drawpixel(OOP_Class *, OOP_Object *, struct pHidd_BitMap_DrawPixel *); -void vgaRefreshPixel(struct bitmap_data *data, unsigned int x, unsigned int y); -void vgaRefreshArea(struct bitmap_data *, struct Box *); -void vgaEraseArea(struct bitmap_data *, struct Box *); +void vgaRefreshPixel(struct VGAGfxBitMapData *data, unsigned int x, unsigned int y); +void vgaRefreshArea(struct VGAGfxBitMapData *, struct Box *); +void vgaEraseArea(struct VGAGfxBitMapData *, struct Box *); -#endif /* _BITMAP_H */ +#endif /* VGAGFX_BITMAP_H */ diff --git a/arch/all-native/hidd/vga/bitmap.c b/arch/all-native/hidd/vga/vgagfx_bitmapclass.c similarity index 86% rename from arch/all-native/hidd/vga/bitmap.c rename to arch/all-native/hidd/vga/vgagfx_bitmapclass.c index c27c5fff26..487daadae4 100644 --- a/arch/all-native/hidd/vga/bitmap.c +++ b/arch/all-native/hidd/vga/vgagfx_bitmapclass.c @@ -2,7 +2,7 @@ Copyright © 1995-2013, The AROS Development Team. All rights reserved. $Id$ - Desc: Bitmap class for VGA hidd. + Desc: Bitmap class for VGA Hidd. Lang: English. */ @@ -22,15 +22,14 @@ #include -#include +#include #include -#include "vgahw.h" -#include "vga.h" -#include "vgaclass.h" - -#include "bitmap.h" +#include "vgagfx_support.h" +#include "vgagfx_intern.h" +#include "vgagfx_hidd.h" +#include "vgagfx_bitmap.h" #include LC_LIBDEFS_FILE @@ -38,20 +37,20 @@ void vgaRestore(struct vgaHWRec *); int vgaInitMode(struct vgaModeDesc *, struct vgaHWRec *); void vgaLoadPalette(struct vgaHWRec *, unsigned char *); -#define MNAME_ROOT(x) PCVGABM__Root__ ## x -#define MNAME_BM(x) PCVGABM__Hidd_BitMap__ ## x +#define MNAME_ROOT(x) VGAGfxBM__Root__ ## x +#define MNAME_BM(x) VGAGfxBM__Hidd_BitMap__ ## x /*********** BitMap::New() *************************************/ -OOP_Object *PCVGABM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +OOP_Object *VGAGfxBM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { EnterFunc(bug("VGAGfx.BitMap::New()\n")); o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg) msg); - D(bug("[VGABitMap] Object created by superclass: 0x%p\n")); + D(bug("[VGAGfx:BitMap] Object created by superclass: 0x%p\n")); if (o) { - struct bitmap_data *data; + struct VGAGfxBitMapData *data; OOP_Object *gfxhidd, *sync, *pf; IPTR modeid = vHidd_ModeID_Invalid; IPTR width, height, depth; @@ -61,7 +60,7 @@ OOP_Object *PCVGABM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m data = OOP_INST_DATA(cl, o); /* clear all data */ - memset(data, 0, sizeof(struct bitmap_data)); + memset(data, 0, sizeof(struct VGAGfxBitMapData)); /* Get attr values */ OOP_GetAttr(o, aHidd_BitMap_ModeID , &modeid ); @@ -69,11 +68,11 @@ OOP_Object *PCVGABM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m OOP_GetAttr(o, aHidd_BitMap_Height , &height ); OOP_GetAttr(o, aHidd_BitMap_Displayable, &displayable); OOP_GetAttr(o, aHidd_BitMap_PixFmt , (IPTR *)&pf ); - D(bug("[VGABitMap] PixFmt object: 0x%p\n", pf)); + D(bug("[VGAGfx:BitMap] PixFmt object: 0x%p\n", pf)); OOP_GetAttr(pf, aHidd_PixFmt_Depth, &depth); - D(bug("[VGABitMap] Size: %lux%lu, depth: %lu\n", width, height, depth)); - D(bug("[VGABitMap] Displayable: %ld\n", displayable)); + D(bug("[VGAGfx:BitMap] Size: %lux%lu, depth: %lu\n", width, height, depth)); + D(bug("[VGAGfx:BitMap] Displayable: %ld\n", displayable)); ASSERT (width != 0 && height != 0 && depth != 0); data->width = width; @@ -88,13 +87,13 @@ OOP_Object *PCVGABM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m OOP_GetAttr(sync, aHidd_Sync_VDisp, &dheight); data->disp_width = dwidth; data->disp_height = dheight; - D(bug("[VGABitMap] Display size: %dx%d\n", dwidth, dheight)); + D(bug("[VGAGfx:BitMap] Display size: %dx%d\n", dwidth, dheight)); } width=(width+15) & ~15; data->bpr = width; data->VideoData = AllocVec(width*height,MEMF_PUBLIC|MEMF_CLEAR); - D(bug("[VGABitMap] Allocated videodata at 0x%p\n", data->VideoData)); + D(bug("[VGAGfx:BitMap] Allocated videodata at 0x%p\n", data->VideoData)); if (data->VideoData) { struct TagItem tags[2]; @@ -108,7 +107,7 @@ OOP_Object *PCVGABM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m ReturnPtr("VGAGfx.BitMap::New()", OOP_Object *, o); data->Regs = AllocVec(sizeof(struct vgaHWRec),MEMF_PUBLIC|MEMF_CLEAR); - D(bug("[VGABitMap] Registers at 0x%p\n", data->Regs)); + D(bug("[VGAGfx:BitMap] Registers at 0x%p\n", data->Regs)); /* Here there is brand new method of getting pixelclock data. It was introduced here to make the code more portable. Besides @@ -142,7 +141,7 @@ OOP_Object *PCVGABM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m vgaInitMode(&mode, data->Regs); vgaLoadPalette(data->Regs,(unsigned char *)NULL); - D(bug("[VGABitMap] Created displayable bitmap 0x%p, data 0x%p\n", o, data)); + D(bug("[VGAGfx:BitMap] Created displayable bitmap 0x%p, data 0x%p\n", o, data)); return o; } } @@ -162,9 +161,9 @@ OOP_Object *PCVGABM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *m /********** Bitmap::Dispose() ***********************************/ -VOID PCVGABM__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) +VOID VGAGfxBM__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { - struct bitmap_data *data = OOP_INST_DATA(cl, o); + struct VGAGfxBitMapData *data = OOP_INST_DATA(cl, o); EnterFunc(bug("VGAGfx.BitMap::Dispose()\n")); FreeVec(data->VideoData); @@ -181,7 +180,7 @@ void vgaDACLoad(struct vgaHWRec *, unsigned char, int); BOOL MNAME_BM(SetColors)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetColors *msg) { - struct bitmap_data *data = OOP_INST_DATA(cl, o); + struct VGAGfxBitMapData *data = OOP_INST_DATA(cl, o); HIDDT_PixelFormat *pf; ULONG xc_i, col_i; @@ -247,7 +246,7 @@ VOID MNAME_BM(PutPixel)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_PutPix VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) { - struct bitmap_data *data = OOP_INST_DATA(cl, o); + struct VGAGfxBitMapData *data = OOP_INST_DATA(cl, o); struct TagItem *tag, *tstate; ULONG idx; int limit; @@ -263,7 +262,7 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) { case aoHidd_BitMap_Visible: data->disp = tag->ti_Data; - D(bug("[VGAGfx] BitMap::Visible set to %d\n", data->disp)); + D(bug("[VGAGfx:BitMap] Visible set to %d\n", data->disp)); if (data->disp) { struct Box box; @@ -328,7 +327,7 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) VOID MNAME_ROOT(Get)(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { - struct bitmap_data *data = OOP_INST_DATA(cl, o); + struct VGAGfxBitMapData *data = OOP_INST_DATA(cl, o); ULONG idx; if (IS_VGABM_ATTR(msg->attrID, idx)) { @@ -355,9 +354,9 @@ VOID MNAME_ROOT(Get)(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) /*** BitMap::UpdateRect() *******************************************/ -VOID PCVGABM__Hidd_BitMap__UpdateRect(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_UpdateRect *msg) +VOID VGAGfxBM__Hidd_BitMap__UpdateRect(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_UpdateRect *msg) { - struct bitmap_data *data = OOP_INST_DATA(cl, o); + struct VGAGfxBitMapData *data = OOP_INST_DATA(cl, o); int left = msg->x + data->xoffset; int top = msg->y + data->yoffset; int right = left + msg->width - 1; diff --git a/arch/all-native/hidd/vga/vgaclass.h b/arch/all-native/hidd/vga/vgagfx_hidd.h similarity index 79% rename from arch/all-native/hidd/vga/vgaclass.h rename to arch/all-native/hidd/vga/vgagfx_hidd.h index 978eaaf579..d2b6b6c36e 100644 --- a/arch/all-native/hidd/vga/vgaclass.h +++ b/arch/all-native/hidd/vga/vgagfx_hidd.h @@ -1,11 +1,11 @@ -#ifndef HIDD_VGACLASS_H -#define HIDD_VGACLASS_H +#ifndef VGAGFX_HIDD_H +#define VGAGFX_HIDD_H /* Copyright © 1995-2001, The AROS Development Team. All rights reserved. $Id$ - Desc: Some VGA useful data. + Desc: VGA Gfx Hidd data. Lang: English. */ @@ -13,6 +13,12 @@ #include #include +/***** VGA gfx HIDD *******************/ + +/* IDs */ +#define IID_Hidd_Gfx_VGA "hidd.gfx.vga" +#define CLID_Hidd_Gfx_VGA "hidd.gfx.vga" + /* I've tested additional modes on my ThinkPad 365x. The display appears either black or broken. Perhaps LCD controller doesn't recognise them. @@ -51,9 +57,9 @@ struct vgaModeEntry struct vgaModeDesc *Desc; }; -struct Vga_Data +struct VGAGfxDriverData { struct Interrupt ResetInterrupt; }; -#endif /* HIDD_VGACLASS_H */ +#endif /* VGAGFX_HIDD_H */ diff --git a/arch/all-native/hidd/vga/vgaclass.c b/arch/all-native/hidd/vga/vgagfx_hiddclass.c similarity index 92% rename from arch/all-native/hidd/vga/vgaclass.c rename to arch/all-native/hidd/vga/vgagfx_hiddclass.c index 573173e574..16492e65de 100644 --- a/arch/all-native/hidd/vga/vgaclass.c +++ b/arch/all-native/hidd/vga/vgagfx_hiddclass.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include @@ -25,20 +25,20 @@ #include #include -#include "vga.h" -#include "vgaclass.h" -#include "bitmap.h" +#include "vgagfx_intern.h" +#include "vgagfx_hidd.h" +#include "vgagfx_bitmap.h" #include LC_LIBDEFS_FILE #define DEBUG 0 #include -static AROS_INTH1(ResetHandler, struct vga_staticdata *, xsd) +static AROS_INTH1(ResetHandler, struct VGAGfx_staticdata *, xsd) { AROS_INTFUNC_INIT - struct bitmap_data *data = NULL; + struct VGAGfxBitMapData *data = NULL; /* On my machine this fills the screen with colorful vertical stripes instead of blanking. So for now we use software method. @@ -109,7 +109,7 @@ VOID init_sync_tags(struct TagItem *tags, struct vgaModeDesc *md, STRPTR name) tags[10].ti_Tag = TAG_DONE; } -OOP_Object *PCVGA__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +OOP_Object *VGAGfx__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { struct TagItem pftags[] = { { aHidd_PixFmt_RedShift , 0 }, /* 0 */ @@ -188,7 +188,7 @@ OOP_Object *PCVGA__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); XSD(cl)->vgahidd = o; if (o) { - struct Vga_Data *data = OOP_INST_DATA(cl, o); + struct VGAGfxDriverData *data = OOP_INST_DATA(cl, o); data->ResetInterrupt.is_Node.ln_Name = cl->ClassNode.ln_Name; data->ResetInterrupt.is_Code = (VOID_FUNC)ResetHandler; @@ -198,16 +198,16 @@ OOP_Object *PCVGA__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg ReturnPtr("VGAGfx::New", OOP_Object *, o); } -VOID PCVGA__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) +VOID VGAGfx__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { - struct Vga_Data *data = OOP_INST_DATA(cl, o); + struct VGAGfxDriverData *data = OOP_INST_DATA(cl, o); RemResetCallback(&data->ResetInterrupt); OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); XSD(cl)->vgahidd = NULL; } -VOID PCVGA__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) +VOID VGAGfx__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { ULONG idx; BOOL found = FALSE; @@ -228,7 +228,7 @@ VOID PCVGA__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) } /********** GfxHidd::CreateObject() ****************************/ -OOP_Object *PCVGA__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) +OOP_Object *VGAGfx__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) { OOP_Object *object = NULL; @@ -266,13 +266,13 @@ OOP_Object *PCVGA__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct p /********* GfxHidd::Show() ***************************/ -OOP_Object *PCVGA__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) +OOP_Object *VGAGfx__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) { /* We currently use class static data instead of object data. In addition we directly access bitmap's private data. This is horribly wrong and needs further refactoring */ - struct vga_staticdata *data = XSD(cl); + struct VGAGfx_staticdata *data = XSD(cl); struct Box box; D(bug("[VGAGfx] Show(0x%p)\n", msg->bitMap)); @@ -323,7 +323,7 @@ OOP_Object *PCVGA__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx /********* GfxHidd::CopyBox() ***************************/ -VOID PCVGA__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CopyBox *msg) +VOID VGAGfx__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CopyBox *msg) { ULONG mode; unsigned char *src = 0, *dest = 0; @@ -353,8 +353,8 @@ VOID PCVGA__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Cop } { - struct bitmap_data *data = OOP_INST_DATA(OOP_OCLASS(msg->src), msg->src); - struct bitmap_data *ddata = OOP_INST_DATA(OOP_OCLASS(msg->dest), msg->dest); + struct VGAGfxBitMapData *data = OOP_INST_DATA(OOP_OCLASS(msg->src), msg->src); + struct VGAGfxBitMapData *ddata = OOP_INST_DATA(OOP_OCLASS(msg->dest), msg->dest); int i, width, phase, j; BOOL descending; @@ -626,9 +626,9 @@ VOID PCVGA__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Cop /********** GfxHidd::SetCursorShape() ****************************/ -BOOL PCVGA__Hidd_Gfx__SetCursorShape(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorShape *msg) +BOOL VGAGfx__Hidd_Gfx__SetCursorShape(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorShape *msg) { - struct vga_staticdata *data = XSD(cl); + struct VGAGfx_staticdata *data = XSD(cl); IPTR curs_width, curs_height; UBYTE *new_curs_pixels; @@ -657,7 +657,7 @@ BOOL PCVGA__Hidd_Gfx__SetCursorShape(OOP_Class *cl, OOP_Object *o, struct pHidd_ /********** GfxHidd::SetCursorPos() ****************************/ -BOOL PCVGA__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorPos *msg) +BOOL VGAGfx__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorPos *msg) { ObtainSemaphore(&XSD(cl)->HW_acc); @@ -668,7 +668,7 @@ BOOL PCVGA__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf if (XSD(cl)->visible) { - struct bitmap_data *bm_data = + struct VGAGfxBitMapData *bm_data = OOP_INST_DATA(XSD(cl)->bmclass, XSD(cl)->visible); if (XSD(cl)->mouseX < 0) XSD(cl)->mouseX = 0; @@ -688,7 +688,7 @@ BOOL PCVGA__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf /********** GfxHidd::SetCursorVisible() ****************************/ -VOID PCVGA__Hidd_Gfx__SetCursorVisible(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorVisible *msg) +VOID VGAGfx__Hidd_Gfx__SetCursorVisible(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorVisible *msg) { XSD(cl)->mouseVisible = msg->visible; @@ -701,7 +701,7 @@ VOID PCVGA__Hidd_Gfx__SetCursorVisible(OOP_Class *cl, OOP_Object *o, struct pHid /* end of stuff added by stegerg */ /*******************************************************************/ -void draw_mouse(struct vga_staticdata *xsd) +void draw_mouse(struct VGAGfx_staticdata *xsd) { int pix; unsigned char *ptr, *data; @@ -714,7 +714,7 @@ void draw_mouse(struct vga_staticdata *xsd) { if (xsd->visible) { - struct bitmap_data *bm_data = + struct VGAGfxBitMapData *bm_data = OOP_INST_DATA(xsd->bmclass, xsd->visible); /* Get display width */ @@ -755,7 +755,7 @@ void draw_mouse(struct vga_staticdata *xsd) } } -void erase_mouse(struct vga_staticdata *data) +void erase_mouse(struct VGAGfx_staticdata *data) { if (data->visible) { struct Box box = {0, 0, 0, 0}; diff --git a/arch/all-native/hidd/vga/vga_init.c b/arch/all-native/hidd/vga/vgagfx_init.c similarity index 86% rename from arch/all-native/hidd/vga/vga_init.c rename to arch/all-native/hidd/vga/vgagfx_init.c index 183c790218..9a4c71250e 100644 --- a/arch/all-native/hidd/vga/vga_init.c +++ b/arch/all-native/hidd/vga/vgagfx_init.c @@ -2,7 +2,7 @@ Copyright © 1995-2015, The AROS Development Team. All rights reserved. $Id$ - Desc: vga gfx Hidd for standalone AROS + Desc: VGA Gfx Hidd for standalone AROS Lang: english */ @@ -19,8 +19,8 @@ #include #include -#include "vga.h" -#include "vgaclass.h" +#include "vgagfx_intern.h" +#include "vgagfx_hidd.h" #include LC_LIBDEFS_FILE @@ -53,10 +53,10 @@ static struct OOP_ABDescr abd[] = { NULL, NULL } }; -static int PCVGA_Init(LIBBASETYPEPTR LIBBASE) +static int VGAGfx_Init(LIBBASETYPEPTR LIBBASE) { struct GfxBase *GfxBase; - struct vga_staticdata *xsd = &LIBBASE->vsd; + struct VGAGfx_staticdata *xsd = &LIBBASE->vsd; struct vgaModeEntry *entry; BOOL res = FALSE; int i; @@ -64,7 +64,7 @@ static int PCVGA_Init(LIBBASETYPEPTR LIBBASE) /* We are not compatible with VESA driver */ if (OOP_FindClass("hidd.gfx.vesa")) { - D(bug("[VGA] VESA driver found, not initializing VGA\n")); + D(bug("[VGAGfx] VESA driver found, not initializing VGA\n")); return FALSE; } @@ -75,7 +75,7 @@ static int PCVGA_Init(LIBBASETYPEPTR LIBBASE) if ((AcpiGetTable("FACP", 1, (ACPI_TABLE_HEADER **)&fadt) == AE_OK) && (fadt->BootFlags & ACPI_FADT_NO_VGA)) { - D(bug("[VGA] Disabled by ACPI\n")); + D(bug("[VGAGfx] Disabled by ACPI\n")); CloseLibrary(ACPICABase); ACPICABase = NULL; return FALSE; @@ -104,7 +104,7 @@ static int PCVGA_Init(LIBBASETYPEPTR LIBBASE) } } - D(bug("[VGA] Init: Everything OK, installing driver\n")); + D(bug("[VGAGfx] Init: Everything OK, installing driver\n")); /* * Open graphics.library ourselves because we will close it @@ -114,7 +114,7 @@ static int PCVGA_Init(LIBBASETYPEPTR LIBBASE) GfxBase = (struct GfxBase *)OpenLibrary("graphics.library", 41); if (!GfxBase) { - D(bug("[VGA] Failed to open graphics.library!\n")); + D(bug("[VGAGfx] Failed to open graphics.library!\n")); return FALSE; } @@ -130,7 +130,7 @@ static int PCVGA_Init(LIBBASETYPEPTR LIBBASE) */ i = AddDisplayDriver(xsd->vgaclass, NULL, DDRV_BootMode, TRUE, TAG_DONE); - D(bug("[VGA] AddDisplayDriver() result: %u\n", i)); + D(bug("[VGAGfx] AddDisplayDriver() result: %u\n", i)); if (!i) { /* We use ourselves, and no one else does */ @@ -142,4 +142,4 @@ static int PCVGA_Init(LIBBASETYPEPTR LIBBASE) return res; } -ADD2INITLIB(PCVGA_Init, 0) +ADD2INITLIB(VGAGfx_Init, 0) diff --git a/arch/all-native/hidd/vga/vga.h b/arch/all-native/hidd/vga/vgagfx_intern.h similarity index 71% rename from arch/all-native/hidd/vga/vga.h rename to arch/all-native/hidd/vga/vgagfx_intern.h index a96435c103..2668656e26 100644 --- a/arch/all-native/hidd/vga/vga.h +++ b/arch/all-native/hidd/vga/vgagfx_intern.h @@ -1,11 +1,11 @@ -#ifndef HIDD_VGA_H -#define HIDD_VGA_H +#ifndef VGAGFX_INTERN_H +#define VGAGFX_INTERN_H /* Copyright © 1995-2015, The AROS Development Team. All rights reserved. $Id$ - Desc: Include for the vga gfx HIDD. + Desc: Private Includes for the VGA Gfx Hidd. Lang: English. */ @@ -22,17 +22,9 @@ # include #endif -#include "bitmap.h" - -/***** VGA gfx HIDD *******************/ - -/* IDs */ -#define IID_Hidd_Gfx_VGA "hidd.gfx.vga" -#define CLID_Hidd_Gfx_VGA "hidd.gfx.vga" - /* misc */ -struct vga_staticdata +struct VGAGfx_staticdata { OOP_Class *vgaclass; OOP_Class *bmclass; @@ -56,17 +48,17 @@ struct vga_staticdata OOP_Class *basebm; }; -struct vgabase +struct VGAGfxBase { struct Library library; - struct vga_staticdata vsd; + struct VGAGfx_staticdata vsd; }; -void draw_mouse (struct vga_staticdata *); -void erase_mouse (struct vga_staticdata *); +void draw_mouse (struct VGAGfx_staticdata *); +void erase_mouse (struct VGAGfx_staticdata *); int vgaBlankScreen(int on); -#define XSD(cl) (&((struct vgabase *)cl->UserData)->vsd) +#define XSD(cl) (&((struct VGAGfxBase *)cl->UserData)->vsd) -#endif /* HIDD_VGA_H */ +#endif /* VGAGFX_INTERN_H */ diff --git a/arch/all-native/hidd/vga/vgahw.c b/arch/all-native/hidd/vga/vgagfx_support.c similarity index 98% rename from arch/all-native/hidd/vga/vgahw.c rename to arch/all-native/hidd/vga/vgagfx_support.c index 1fc8038181..f2dc14fcff 100644 --- a/arch/all-native/hidd/vga/vgahw.c +++ b/arch/all-native/hidd/vga/vgagfx_support.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2012, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: VGA Inside... + Desc: VGAGfx hardware support routines... Lang: English. */ @@ -16,9 +16,9 @@ #include #include -#include "vgahw.h" -#include "vgaclass.h" -#include "bitmap.h" +#include "vgagfx_support.h" +#include "vgagfx_hidd.h" +#include "vgagfx_bitmap.h" /****************************************************************************************/ @@ -424,7 +424,7 @@ int vgaInitMode(struct vgaModeDesc *mode, struct vgaHWRec *regs) /****************************************************************************************/ -void vgaRefreshPixel(struct bitmap_data *data, unsigned int x, unsigned int y) +void vgaRefreshPixel(struct VGAGfxBitMapData *data, unsigned int x, unsigned int y) { int pix; char *ptr, *ptr2; @@ -449,7 +449,7 @@ void vgaRefreshPixel(struct bitmap_data *data, unsigned int x, unsigned int y) /****************************************************************************************/ -void vgaRefreshArea(struct bitmap_data *bmap, struct Box *pbox) +void vgaRefreshArea(struct VGAGfxBitMapData *bmap, struct Box *pbox) { int width, height, FBPitch, left, right, i, j, SRCPitch, phase; register ULONG m; @@ -685,7 +685,7 @@ void vgaRefreshArea(struct bitmap_data *bmap, struct Box *pbox) /****************************************************************************************/ -void vgaEraseArea(struct bitmap_data *bmap, struct Box *pbox) +void vgaEraseArea(struct VGAGfxBitMapData *bmap, struct Box *pbox) { int width, height, FBPitch, left, right; unsigned char *dst; diff --git a/arch/all-native/hidd/vga/vgahw.h b/arch/all-native/hidd/vga/vgagfx_support.h similarity index 91% rename from arch/all-native/hidd/vga/vgahw.h rename to arch/all-native/hidd/vga/vgagfx_support.h index f4627c4c6b..6040aa3b43 100644 --- a/arch/all-native/hidd/vga/vgahw.h +++ b/arch/all-native/hidd/vga/vgagfx_support.h @@ -1,14 +1,15 @@ -#ifndef HIDD_VGAHW_H -#define HIDD_VGAHW_H +#ifndef VGAGFX_SUPPORT_H +#define VGAGFX_SUPPORT_H /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: VGA hardwired. + Desc: VGAGfx hardware support. Lang: English. */ +#if (1) /* I have to move away this defines - should be in separate file */ #define inb(port) \ @@ -38,6 +39,8 @@ ({ LONG __value=(val); \ __asm__ __volatile__ ("outl %%eax,%%dx"::"a"(__value),"d"(port)); }) +#endif + #define DACDelay \ { \ unsigned char temp = inb(vgaIOBase + 0x0A); \ @@ -85,4 +88,4 @@ struct vgaHWRec #define CRTC_MODE 23 #define CRTC_LINE_COMPARE 24 -#endif /* HIDD_VGAHW_H */ +#endif /* VGAGFX_SUPPORT_H */ diff --git a/arch/all-unix/boot/AROSBootstrap.conf b/arch/all-unix/boot/AROSBootstrap.conf index 089857e768..ab2473d2bd 100644 --- a/arch/all-unix/boot/AROSBootstrap.conf +++ b/arch/all-unix/boot/AROSBootstrap.conf @@ -25,7 +25,7 @@ module Devs/lddemon.resource module Devs/input.device module Devs/keyboard.device -module Devs/Drivers/graphics.hidd +module Devs/Drivers/gfx.hidd module Devs/Drivers/hiddclass.hidd module Devs/Drivers/keyboard.hidd module Devs/Drivers/mouse.hidd diff --git a/arch/all-unix/boot/AROSBootstrap_android.conf b/arch/all-unix/boot/AROSBootstrap_android.conf index 8b9a0f4e8e..0ce190ca19 100644 --- a/arch/all-unix/boot/AROSBootstrap_android.conf +++ b/arch/all-unix/boot/AROSBootstrap_android.conf @@ -27,7 +27,7 @@ module Devs/lddemon.resource module Devs/input.device module Devs/keyboard.device -module Devs/Drivers/graphics.hidd +module Devs/Drivers/gfx.hidd module Devs/Drivers/hiddclass.hidd module Devs/Drivers/keyboard.hidd module Devs/Drivers/mouse.hidd diff --git a/arch/all-unix/boot/AROSBootstrap_darwin.conf b/arch/all-unix/boot/AROSBootstrap_darwin.conf index 089857e768..ab2473d2bd 100644 --- a/arch/all-unix/boot/AROSBootstrap_darwin.conf +++ b/arch/all-unix/boot/AROSBootstrap_darwin.conf @@ -25,7 +25,7 @@ module Devs/lddemon.resource module Devs/input.device module Devs/keyboard.device -module Devs/Drivers/graphics.hidd +module Devs/Drivers/gfx.hidd module Devs/Drivers/hiddclass.hidd module Devs/Drivers/keyboard.hidd module Devs/Drivers/mouse.hidd diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/mmakefile.src b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/mmakefile.src index 9140197971..da71c008b7 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/mmakefile.src +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/mmakefile.src @@ -6,7 +6,7 @@ USER_LDFLAGS := -static FILES := \ videocoregfx_init \ - videocoregfx_class \ + videocoregfx_hiddclass \ videocoregfx_memory \ videocoregfx_sdtv \ videocoregfx_hdmi \ diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx.conf b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx.conf index 6350b278c0..2619e18d7f 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx.conf +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx.conf @@ -1,7 +1,7 @@ ##begin config basename VideoCoreGfx libbasetype struct VideoCoreGfxBase -version 42.1 +version 45.0 residentpri 9 classptr_field vsd.vcsd_VideoCoreGfxClass classid CLID_Hidd_VideoCoreGfx diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmap.h b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmap.h index 4947f723e9..b6066c3214 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmap.h +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmap.h @@ -1,17 +1,17 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ #ifndef _VIDEOCOREGFX_BITMAP_H #define _VIDEOCOREGFX_BITMAP_H -#include +#include /* This attribute interface is common for both onscreen and offscreen bitmap classes, although they don't share a common superclass */ -#define IID_Hidd_VideoCoreGfxBitMap "hidd.bitmap.videocore" +#define IID_Hidd_BitMap_VideoCore "hidd.bitmap.videocore" enum { diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmap_common.c b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmapclass.c similarity index 98% rename from arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmap_common.c rename to arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmapclass.c index a7ea15b37f..4e7231f876 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmap_common.c +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2013-2015, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_class.h b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_hidd.h similarity index 94% rename from arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_class.h rename to arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_hidd.h index dde7225e3d..1b7c642fde 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_class.h +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_hidd.h @@ -1,7 +1,7 @@ #ifndef _VIDEOCOREGFX_CLASS_H #define _VIDEOCOREGFX_CLASS_H /* - Copyright © 2013-2015, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -23,8 +23,8 @@ //#define VC_FMT_15 //#define VC_FMT_8 -#define IID_Hidd_VideoCoreGfx "hidd.gfx.videocore" -#define CLID_Hidd_VideoCoreGfx "hidd.gfx.videocore" +#define IID_Hidd_Gfx_VideoCore "hidd.gfx.videocore" +#define CLID_Hidd_Gfx_VideoCore "hidd.gfx.videocore" #define MAX_TAGS 256 #define ATTRBASES_NUM 8 diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_class.c b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_hiddclass.c similarity index 98% rename from arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_class.c rename to arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_hiddclass.c index a2e7ba1369..fd05baa599 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_class.c +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2013-2015, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ Desc: VideoCore Gfx Hidd Class. @@ -23,12 +23,12 @@ #include #include #include -#include +#include #include #include #include -#include "videocoregfx_class.h" +#include "videocoregfx_hidd.h" #include "videocoregfx_hardware.h" #include "videocoregfx_bitmap.h" diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_init.c b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_init.c index de0823d31c..9e244f7cbd 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_init.c +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_init.c @@ -1,5 +1,5 @@ /* - Copyright © 2013-2015, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ Desc: VideoCore Hidd initialisation code @@ -22,12 +22,12 @@ #include #include #include -#include +#include #include #include #include -#include "videocoregfx_class.h" +#include "videocoregfx_hidd.h" #include "videocoregfx_hardware.h" #include LC_LIBDEFS_FILE @@ -74,8 +74,8 @@ static BOOL FNAME_SUPPORT(GetAttrBases)(const STRPTR *iftable, OOP_AttrBase *bas static const STRPTR interfaces[] = { - IID_Hidd_VideoCoreGfx, - IID_Hidd_VideoCoreGfxBitMap, + IID_Hidd_Gfx_VideoCore, + IID_Hidd_BitMap_VideoCore, IID_Hidd_ChunkyBM, IID_Hidd_BitMap, IID_Hidd_PixFmt, diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_memory.c b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_memory.c index 9bf01dc2d1..a806563c08 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_memory.c +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_memory.c @@ -1,5 +1,5 @@ /* - Copyright © 2013-2015, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -17,13 +17,13 @@ #include #include #include -#include +#include #include #include #include #include -#include "videocoregfx_class.h" +#include "videocoregfx_hidd.h" #include "videocoregfx_hardware.h" #include LC_LIBDEFS_FILE diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_onbitmap.c b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_onbitmap.c index 1452f884a1..5aedebfe15 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_onbitmap.c +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_onbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 2013-2015, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ Desc: VideoCore Gfx Onscreen Bitmap Class. @@ -20,11 +20,11 @@ #include #include #include -#include +#include #include #include "videocoregfx_bitmap.h" -#include "videocoregfx_class.h" +#include "videocoregfx_hidd.h" #include LC_LIBDEFS_FILE @@ -38,7 +38,7 @@ #define MNAME_BM(x) VideoCoreGfxOnBM__Hidd_BitMap__ ## x #define OnBitmap 1 -#include "videocoregfx_bitmap_common.c" +#include "videocoregfx_bitmapclass.c" /*********** BitMap::New() *************************************/ diff --git a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_pixfmts.c b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_pixfmts.c index 6caaf7a2db..1be5d3ccad 100644 --- a/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_pixfmts.c +++ b/arch/arm-native/soc/broadcom/2708/hidd/videocoregfx/videocoregfx_pixfmts.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -12,10 +12,10 @@ #include #include #include -#include +#include #include -#include "videocoregfx_class.h" +#include "videocoregfx_hidd.h" #define ARRAYSIZE_TRUECOLOR 13 #define ARRAYSIZE_LUT 15 diff --git a/arch/i386-all/hidd/graphics/mmakefile.src b/arch/i386-all/hidd/graphics/mmakefile.src index 9d91526224..47b14f095f 100644 --- a/arch/i386-all/hidd/graphics/mmakefile.src +++ b/arch/i386-all/hidd/graphics/mmakefile.src @@ -2,15 +2,15 @@ include $(SRCDIR)/config/aros.cfg -#MM kernel-hidd-graphics-i386 : kernel-hidd-includes +#MM kernel-hidd-gfx-i386 : kernel-hidd-includes FILES := rgbconv_arch AFILES := -USER_CFLAGS := -I$(SRCDIR)/rom/hidds/graphics +USER_CFLAGS := -I$(SRCDIR)/rom/hidds/gfx %build_archspecific \ - mainmmake=kernel-hidd-graphics maindir=rom/hidds/graphics \ + mainmmake=kernel-hidd-graphics maindir=rom/hidds/gfx \ asmfiles=$(AFILES) files=$(FILES) \ arch=i386 diff --git a/arch/i386-all/hidd/graphics/rgbconv_arch.c b/arch/i386-all/hidd/graphics/rgbconv_arch.c index bfb1190d85..f2a29b3101 100644 --- a/arch/i386-all/hidd/graphics/rgbconv_arch.c +++ b/arch/i386-all/hidd/graphics/rgbconv_arch.c @@ -1,10 +1,10 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include #include "colorconv/rgbconv_macros.h" diff --git a/arch/i386-pc/boot/mmakefile.src b/arch/i386-pc/boot/mmakefile.src index 2799992a5d..9633ac7b92 100644 --- a/arch/i386-pc/boot/mmakefile.src +++ b/arch/i386-pc/boot/mmakefile.src @@ -49,8 +49,8 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-hidd-i8042 \ #MM kernel-hidd-pci \ #MM kernel-hidd-pci-pcipc \ -#MM kernel-hidd-vesa \ -#MM kernel-hidd-vga +#MM kernel-hidd-vesagfx \ +#MM kernel-hidd-vgagfx KRSRCS := efi hpet KRSRCS_ARCH := battclock processor @@ -58,7 +58,7 @@ KLIBS := acpica KLIBS_ARCH := expansion KDEVS := ahci ata KDEVS_ARCH := timer -KHIDDS := ata_pci i8042 vesagfx vgah pci pcipc serial parallel +KHIDDS := ata_pci i8042 vesagfx vgagfx pci pcipc serial parallel %make_package mmake=kernel-bsp-pc-i386 file=$(AROSARCHDIR)/aros-bsp.pkg \ devs=$(KDEVS) arch_devs=$(KDEVS_ARCH) hidds=$(KHIDDS) libs=$(KLIBS) \ diff --git a/arch/m68k-amiga/boot/mmakefile.src b/arch/m68k-amiga/boot/mmakefile.src index 5f72b19ab7..42e579fa68 100644 --- a/arch/m68k-amiga/boot/mmakefile.src +++ b/arch/m68k-amiga/boot/mmakefile.src @@ -44,7 +44,7 @@ Q ?= @ #MM kernel-graphics-kobj \ #MM kernel-hidd-kobj \ #MM kernel-hidd-gayleata-kobj \ -#MM kernel-hidd-graphics-kobj \ +#MM kernel-hidd-gfx-kobj \ #MM kernel-hidd-kbd-kobj \ #MM kernel-hidd-mouse-kobj \ #MM kernel-hidd-amigakbd-kobj \ @@ -120,7 +120,7 @@ AFILES=rom_entry rom_init cpu_detect superstack_swap KLIBS := exec aros dos utility oop expansion partition debug KDEVS := timer input keyboard console trackdisk gameport audio ata KHNDLRS := con afs ram -KHIDDS := hiddclass graphics keyboard mouse amigakbd amigamouse amigavideo uaegfx ata_gayle +KHIDDS := hiddclass gfx keyboard mouse amigakbd amigamouse amigavideo uaegfx ata_gayle KRSRCS := battclock kernel processor task lddemon dosboot cia potgo disk FileSystem misc shell card bootloader KHOOKS := diag romboot @@ -306,7 +306,7 @@ KLIBS := aros utility dos oop mathffp mathieeesingbas partition \ keymap graphics layers intuition gadtools icon workbench setpatch KDEVS := timer input keyboard console trackdisk gameport audio ata cd KHNDLRS := cdfs con afs ram -KHIDDS := hiddclass graphics keyboard mouse amigakbd amigamouse amigavideo uaegfx ata_gayle +KHIDDS := hiddclass gfx keyboard mouse amigakbd amigamouse amigavideo uaegfx ata_gayle KRSRCS := battclock processor lddemon dosboot cia potgo disk \ misc shell shellcommands workbook wbtag card FileSystem KHOOKS := alert romboot diff --git a/arch/m68k-amiga/hidd/amigavideo/amigavideo.conf b/arch/m68k-amiga/hidd/amigavideo/amigavideo.conf index 6311475af4..9858b7476e 100644 --- a/arch/m68k-amiga/hidd/amigavideo/amigavideo.conf +++ b/arch/m68k-amiga/hidd/amigavideo/amigavideo.conf @@ -2,9 +2,9 @@ basename AmigaVideoCl libbase AmigaVideoClBase libbasetype struct amigavideoclbase -version 42.1 +version 45.0 residentpri 9 -classid CLID_Hidd_AmigaVideoGfx +classid CLID_Hidd_Gfx_AmigaVideo superclass CLID_Hidd_Gfx classptr_field csd.amigagfxclass classdatatype struct amigagfx_data @@ -13,10 +13,10 @@ oopbase_field csd.cs_OOPBase ##end config ##begin cdefprivate -#include +#include #include -#include "amigavideogfx.h" -#include "amigavideobitmap.h" +#include "amigavideo_hidd.h" +#include "amigavideo_bitmap.h" ##end cdefprivate diff --git a/arch/m68k-amiga/hidd/amigavideo/amigavideobitmap.h b/arch/m68k-amiga/hidd/amigavideo/amigavideo_bitmap.h similarity index 67% rename from arch/m68k-amiga/hidd/amigavideo/amigavideobitmap.h rename to arch/m68k-amiga/hidd/amigavideo/amigavideo_bitmap.h index d4bab73a13..d61610b12f 100644 --- a/arch/m68k-amiga/hidd/amigavideo/amigavideobitmap.h +++ b/arch/m68k-amiga/hidd/amigavideo/amigavideo_bitmap.h @@ -1,23 +1,23 @@ /* - Copyright 1995-2010, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #ifndef _AMIGABITMAP_H #define _AMIGABITMAP_H -#define IID_Hidd_AmigaVideoBitMap "hidd.bitmap.amigavideobitmap" +#define IID_Hidd_BitMap_AmigaVideo "hidd.bitmap.amigavideo" enum { - aoHidd_AmigaVideoBitMap_Drawable, - num_Hidd_AmigaVideoBitMap_Attrs + aoHidd_BitMap_AmigaVideo_Drawable, + num_Hidd_BitMap_AmigaVideo_Attrs }; -#define aHidd_AmigaVideoBitMap_Drawable (__IHidd_AmigaVideoBitmap + aoHidd_AmigaVideoBitMap_Drawable) +#define aHidd_BitMap_AmigaVideo_Drawable (__IHidd_BitMap_AmigaVideo + aoHidd_BitMap_AmigaVideo_Drawable) #define IS_BM_ATTR(attr, idx) ( ( (idx) = (attr) - __IHidd_Attr) < num_Hidd_BitMap_Attrs) -#define IS_AmigaVideoBM_ATTR(attr, idx) ( ( (idx) = (attr) - __IHidd_AmigaVideoBitmap) < num_Hidd_AmigaVideoBitMap_Attrs) +#define IS_AmigaVideoBM_ATTR(attr, idx) ( ( (idx) = (attr) - __IHidd_BitMap_AmigaVideo) < num_Hidd_BitMap_AmigaVideo_Attrs) /* This structure is used as instance data for the bitmap class. diff --git a/arch/m68k-amiga/hidd/amigavideo/amigavideobitmap.c b/arch/m68k-amiga/hidd/amigavideo/amigavideo_bitmapclass.c similarity index 98% rename from arch/m68k-amiga/hidd/amigavideo/amigavideobitmap.c rename to arch/m68k-amiga/hidd/amigavideo/amigavideo_bitmapclass.c index fa472c30b1..76fa8e70f0 100644 --- a/arch/m68k-amiga/hidd/amigavideo/amigavideobitmap.c +++ b/arch/m68k-amiga/hidd/amigavideo/amigavideo_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright 1995-2010, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Bitmap class for native Amiga chipset. @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #define CMDDEBUGUNIMP(x) ; @@ -32,8 +32,8 @@ #include LC_LIBDEFS_FILE -#include "amigavideogfx.h" -#include "amigavideobitmap.h" +#include "amigavideo_hidd.h" +#include "amigavideo_bitmap.h" #include "chipset.h" #include "blitter.h" @@ -185,12 +185,12 @@ VOID AmigaVideoBM__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg struct amigabm_data *data = OOP_INST_DATA(cl, o); ULONG idx; - DB2(bug("AmigaVideoBM__Root__Get %d, Attr=%d AmigaVideoBitmap=%d\n", msg->attrID, __IHidd_Attr, __IHidd_AmigaVideoBitmap)); + DB2(bug("AmigaVideoBM__Root__Get %d, Attr=%d AmigaVideoBitmap=%d\n", msg->attrID, __IHidd_Attr, __IHidd_BitMap_AmigaVideo)); if (IS_AmigaVideoBM_ATTR(msg->attrID, idx)) { DB2(bug("AVBM=%d\n", idx)); switch (idx) { - case aoHidd_AmigaVideoBitMap_Drawable: + case aoHidd_BitMap_AmigaVideo_Drawable: *msg->storage = TRUE; return; } diff --git a/arch/m68k-amiga/hidd/amigavideo/amigavideogfx.h b/arch/m68k-amiga/hidd/amigavideo/amigavideo_hidd.h similarity index 96% rename from arch/m68k-amiga/hidd/amigavideo/amigavideogfx.h rename to arch/m68k-amiga/hidd/amigavideo/amigavideo_hidd.h index 432c7ea659..3a111a6d5f 100644 --- a/arch/m68k-amiga/hidd/amigavideo/amigavideogfx.h +++ b/arch/m68k-amiga/hidd/amigavideo/amigavideo_hidd.h @@ -7,11 +7,11 @@ #include #include -#include "amigavideoclass.h" +#include "amigavideo_intern.h" #define __IHidd_BitMap (csd->hiddBitMapAttrBase) #define __IHidd_PlanarBM (csd->hiddPlanarBitMapAttrBase) -#define __IHidd_AmigaVideoBitmap (csd->hiddAmigaVideoBitMapAttrBase) +#define __IHidd_BitMap_AmigaVideo (csd->hiddAmigaVideoBitMapAttrBase) #define __IHidd_GC (csd->hiddGCAttrBase) #define __IHidd_Sync (csd->hiddSyncAttrBase) #define __IHidd_PixFmt (csd->hiddPixFmtAttrBase) diff --git a/arch/m68k-amiga/hidd/amigavideo/amigavideogfx.c b/arch/m68k-amiga/hidd/amigavideo/amigavideo_hiddclass.c similarity index 97% rename from arch/m68k-amiga/hidd/amigavideo/amigavideogfx.c rename to arch/m68k-amiga/hidd/amigavideo/amigavideo_hiddclass.c index 1c44209742..166ae48b05 100644 --- a/arch/m68k-amiga/hidd/amigavideo/amigavideogfx.c +++ b/arch/m68k-amiga/hidd/amigavideo/amigavideo_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -22,12 +22,12 @@ #include #include -#include +#include #include -#include "amigavideogfx.h" -#include "amigavideobitmap.h" +#include "amigavideo_hidd.h" +#include "amigavideo_bitmap.h" #include "chipset.h" #include "blitter.h" @@ -797,8 +797,8 @@ VOID AmigaVideoCl__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *o, struct pHidd_ IPTR src, dst; BOOL ok = FALSE; - OOP_GetAttr(msg->src, aHidd_AmigaVideoBitMap_Drawable, &src); - OOP_GetAttr(msg->dest, aHidd_AmigaVideoBitMap_Drawable, &dst); + OOP_GetAttr(msg->src, aHidd_BitMap_AmigaVideo_Drawable, &src); + OOP_GetAttr(msg->dest, aHidd_BitMap_AmigaVideo_Drawable, &dst); if (src && dst) { struct amigabm_data *sdata = OOP_INST_DATA(OOP_OCLASS(msg->src), msg->src); struct amigabm_data *ddata = OOP_INST_DATA(OOP_OCLASS(msg->dest), msg->dest); @@ -816,8 +816,8 @@ BOOL AmigaVideoCl__Hidd_Gfx__CopyBoxMasked(OOP_Class *cl, OOP_Object *o, struct IPTR src, dst; BOOL ok = FALSE; - OOP_GetAttr(msg->src, aHidd_AmigaVideoBitMap_Drawable, &src); - OOP_GetAttr(msg->dest, aHidd_AmigaVideoBitMap_Drawable, &dst); + OOP_GetAttr(msg->src, aHidd_BitMap_AmigaVideo_Drawable, &src); + OOP_GetAttr(msg->dest, aHidd_BitMap_AmigaVideo_Drawable, &dst); if (src && dst) { struct amigabm_data *sdata = OOP_INST_DATA(OOP_OCLASS(msg->src), msg->src); struct amigabm_data *ddata = OOP_INST_DATA(OOP_OCLASS(msg->dest), msg->dest); @@ -908,7 +908,7 @@ static void freeattrbases(struct amigavideo_staticdata *csd) OOP_ReleaseAttrBase(IID_Hidd_BitMap); OOP_ReleaseAttrBase(IID_Hidd_PlanarBM); - OOP_ReleaseAttrBase(IID_Hidd_AmigaVideoBitMap); + OOP_ReleaseAttrBase(IID_Hidd_BitMap_AmigaVideo); OOP_ReleaseAttrBase(IID_Hidd_GC); OOP_ReleaseAttrBase(IID_Hidd_Sync); OOP_ReleaseAttrBase(IID_Hidd_Gfx); @@ -924,14 +924,14 @@ int Init_AmigaVideoClass(LIBBASETYPEPTR LIBBASE) D(bug("Init_AmigaVideoClass\n")); __IHidd_BitMap = OOP_ObtainAttrBase(IID_Hidd_BitMap); __IHidd_PlanarBM = OOP_ObtainAttrBase(IID_Hidd_PlanarBM); - __IHidd_AmigaVideoBitmap = OOP_ObtainAttrBase(IID_Hidd_AmigaVideoBitMap); + __IHidd_BitMap_AmigaVideo = OOP_ObtainAttrBase(IID_Hidd_BitMap_AmigaVideo); __IHidd_GC = OOP_ObtainAttrBase(IID_Hidd_GC); __IHidd_Sync = OOP_ObtainAttrBase(IID_Hidd_Sync); __IHidd_Gfx = OOP_ObtainAttrBase(IID_Hidd_Gfx); __IHidd_PixFmt = OOP_ObtainAttrBase(IID_Hidd_PixFmt); __IHidd_ColorMap = OOP_ObtainAttrBase(IID_Hidd_ColorMap); - if (!__IHidd_BitMap || !__IHidd_PlanarBM || !__IHidd_AmigaVideoBitmap || !__IHidd_GC || + if (!__IHidd_BitMap || !__IHidd_PlanarBM || !__IHidd_BitMap_AmigaVideo || !__IHidd_GC || !__IHidd_Sync || !__IHidd_Gfx || !__IHidd_PixFmt || !__IHidd_ColorMap) { D(bug("Init_AmigaVideoClass fail\n")); diff --git a/arch/m68k-amiga/hidd/amigavideo/amigavideoclass.h b/arch/m68k-amiga/hidd/amigavideo/amigavideo_intern.h similarity index 76% rename from arch/m68k-amiga/hidd/amigavideo/amigavideoclass.h rename to arch/m68k-amiga/hidd/amigavideo/amigavideo_intern.h index 1ecd3f0606..f416341341 100644 --- a/arch/m68k-amiga/hidd/amigavideo/amigavideoclass.h +++ b/arch/m68k-amiga/hidd/amigavideo/amigavideo_intern.h @@ -2,7 +2,7 @@ #define AMIGAVIDEO_LIBNAME "amigavideo.hidd" -#define CLID_Hidd_AmigaVideoGfx "hidd.gfx.amigavideo" +#define CLID_Hidd_Gfx_AmigaVideo "hidd.gfx.amigavideo" struct AmigaVideoBase { diff --git a/arch/m68k-amiga/hidd/amigavideo/blitter.c b/arch/m68k-amiga/hidd/amigavideo/blitter.c index 8c4dce9c83..c2019ded73 100644 --- a/arch/m68k-amiga/hidd/amigavideo/blitter.c +++ b/arch/m68k-amiga/hidd/amigavideo/blitter.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,10 +9,10 @@ #include #include #include -#include +#include -#include "amigavideogfx.h" -#include "amigavideobitmap.h" +#include "amigavideo_hidd.h" +#include "amigavideo_bitmap.h" #include "blitter.h" #define DEBUG 0 diff --git a/arch/m68k-amiga/hidd/amigavideo/chipset.c b/arch/m68k-amiga/hidd/amigavideo/chipset.c index bb360d41ad..6b46e89e98 100644 --- a/arch/m68k-amiga/hidd/amigavideo/chipset.c +++ b/arch/m68k-amiga/hidd/amigavideo/chipset.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -11,11 +11,11 @@ #include #include #include -#include +#include #include -#include "amigavideogfx.h" -#include "amigavideobitmap.h" +#include "amigavideo_hidd.h" +#include "amigavideo_bitmap.h" #include "chipset.h" #define DEBUG 0 diff --git a/arch/m68k-amiga/hidd/amigavideo/chipset.h b/arch/m68k-amiga/hidd/amigavideo/chipset.h index d205512a0a..0654da05e2 100644 --- a/arch/m68k-amiga/hidd/amigavideo/chipset.h +++ b/arch/m68k-amiga/hidd/amigavideo/chipset.h @@ -2,7 +2,7 @@ #ifndef _AMIGACHIPSETBITMAP_H #define _AMIGACHIPSETBITMAP_H -#include +#include void resetmode(struct amigavideo_staticdata *data); BOOL setmode(struct amigavideo_staticdata *data, struct amigabm_data*); diff --git a/arch/m68k-amiga/hidd/amigavideo/mmakefile.src b/arch/m68k-amiga/hidd/amigavideo/mmakefile.src index 6fc0c123d7..87d8b63f12 100644 --- a/arch/m68k-amiga/hidd/amigavideo/mmakefile.src +++ b/arch/m68k-amiga/hidd/amigavideo/mmakefile.src @@ -10,4 +10,4 @@ USER_CFLAGS += -D__OOP_NOATTRBASES__ -D__OOP_NOMETHODBASES__ \ %build_module mmake=kernel-amiga-m68k-amigavideo \ modname=amigavideo modtype=hidd \ - files="startup amigavideogfx amigavideobitmap chipset blitter" uselibs="hiddstubs" + files="startup amigavideo_hiddclass amigavideo_bitmapclass chipset blitter" uselibs="hiddstubs" diff --git a/arch/m68k-amiga/hidd/amigavideo/startup.c b/arch/m68k-amiga/hidd/amigavideo/startup.c index 078195040c..432f8ec040 100644 --- a/arch/m68k-amiga/hidd/amigavideo/startup.c +++ b/arch/m68k-amiga/hidd/amigavideo/startup.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,13 +9,13 @@ #include #include #include -#include +#include #include #include #include -#include "amigavideogfx.h" -#include "amigavideobitmap.h" +#include "amigavideo_hidd.h" +#include "amigavideo_bitmap.h" #include "chipset.h" #include LC_LIBDEFS_FILE diff --git a/arch/m68k-amiga/hidd/graphics/mmakefile.src b/arch/m68k-amiga/hidd/graphics/mmakefile.src index 340856dda5..9d90a5bf16 100644 --- a/arch/m68k-amiga/hidd/graphics/mmakefile.src +++ b/arch/m68k-amiga/hidd/graphics/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -#MM kernel-hidd-graphics-amiga-m68k: kernel-hidd-includes +#MM kernel-hidd-gfx-amiga-m68k: kernel-hidd-includes FILES := rgbconv AFILES := @@ -10,7 +10,7 @@ AFILES := USER_CFLAGS := -I$(SRCDIR)/rom/hidds/graphics %build_archspecific \ - mainmmake=kernel-hidd-graphics maindir=rom/hidds/graphics \ + mainmmake=kernel-hidd-gfx maindir=rom/hidds/graphics \ asmfiles=$(AFILES) files=$(FILES) \ arch=amiga-m68k diff --git a/arch/m68k-amiga/hidd/graphics/rgbconv.c b/arch/m68k-amiga/hidd/graphics/rgbconv.c index 07c09108b8..e595459bbe 100644 --- a/arch/m68k-amiga/hidd/graphics/rgbconv.c +++ b/arch/m68k-amiga/hidd/graphics/rgbconv.c @@ -1,10 +1,10 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include #include "colorconv/rgbconv_macros.h" #include "colorconv/rgbconv_rgbswap.h" diff --git a/arch/m68k-amiga/hidd/uaegfx/mmakefile.src b/arch/m68k-amiga/hidd/uaegfx/mmakefile.src index 1cdca615bd..30210b888e 100644 --- a/arch/m68k-amiga/hidd/uaegfx/mmakefile.src +++ b/arch/m68k-amiga/hidd/uaegfx/mmakefile.src @@ -8,4 +8,4 @@ USER_CFLAGS := -D__OOP_NOATTRBASES__ -D__GRAPHICS_NOHIDDBASE__ \ %build_module mmake=kernel-amiga-m68k-uaegfx \ modname=uaegfx modtype=hidd \ - files="startup uaegfx uaegfxbitmap uaertg" + files="startup uaegfx_hiddclass uaegfx_bitmapclass uaertg" diff --git a/arch/m68k-amiga/hidd/uaegfx/startup.c b/arch/m68k-amiga/hidd/uaegfx/startup.c index 8dc5301b70..e957f36e2e 100644 --- a/arch/m68k-amiga/hidd/uaegfx/startup.c +++ b/arch/m68k-amiga/hidd/uaegfx/startup.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -13,8 +13,8 @@ #include #include -#include "uaegfx.h" -#include "uaegfxbitmap.h" +#include "uaegfx_intern.h" +#include "uaegfx_bitmap.h" #include LC_LIBDEFS_FILE diff --git a/arch/m68k-amiga/hidd/uaegfx/uaegfx.conf b/arch/m68k-amiga/hidd/uaegfx/uaegfx.conf index 21710fd21f..95ae67956a 100644 --- a/arch/m68k-amiga/hidd/uaegfx/uaegfx.conf +++ b/arch/m68k-amiga/hidd/uaegfx/uaegfx.conf @@ -2,9 +2,9 @@ basename UAEGFXCl libbase UAEGFXClBase libbasetype struct UAEGFXclbase -version 42.1 +version 45.0 residentpri -10 -classid CLID_Hidd_UAEGfx +classid CLID_Hidd_Gfx_UAE superclass CLID_Hidd_Gfx classptr_field csd.gfxclass classdatatype struct gfx_data @@ -14,9 +14,9 @@ oopbase_field csd.cs_OOPBase ##end config ##begin cdefprivate -#include -#include "uaegfx.h" -#include "uaegfxbitmap.h" +#include +#include "uaegfx_intern.h" +#include "uaegfx_bitmap.h" ##end cdefprivate diff --git a/arch/m68k-amiga/hidd/uaegfx/uaegfxbitmap.h b/arch/m68k-amiga/hidd/uaegfx/uaegfx_bitmap.h similarity index 86% rename from arch/m68k-amiga/hidd/uaegfx/uaegfxbitmap.h rename to arch/m68k-amiga/hidd/uaegfx/uaegfx_bitmap.h index a426d56a17..5d2a0ac3d2 100644 --- a/arch/m68k-amiga/hidd/uaegfx/uaegfxbitmap.h +++ b/arch/m68k-amiga/hidd/uaegfx/uaegfx_bitmap.h @@ -1,12 +1,12 @@ /* - Copyright 1995-2010, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #ifndef _UAEGFXBITMAP_H #define _UAEGFXBITMAP_H -#define IID_Hidd_UAEGFXBitMap "hidd.bitmap.uaegfxbitmap" +#define IID_Hidd_BitMap_UAE "hidd.bitmap.uae" #include "uaertg.h" diff --git a/arch/m68k-amiga/hidd/uaegfx/uaegfxbitmap.c b/arch/m68k-amiga/hidd/uaegfx/uaegfx_bitmapclass.c similarity index 99% rename from arch/m68k-amiga/hidd/uaegfx/uaegfxbitmap.c rename to arch/m68k-amiga/hidd/uaegfx/uaegfx_bitmapclass.c index 15fdf859e0..05753336b3 100644 --- a/arch/m68k-amiga/hidd/uaegfx/uaegfxbitmap.c +++ b/arch/m68k-amiga/hidd/uaegfx/uaegfx_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright 1995-2010, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Bitmap class for native Amiga chipset. @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #define DEBUG 0 @@ -33,8 +33,8 @@ #include LC_LIBDEFS_FILE -#include "uaegfx.h" -#include "uaegfxbitmap.h" +#include "uaegfx_intern.h" +#include "uaegfx_bitmap.h" #include "uaertg.h" /* LOCK_BITMAP_MULTI: diff --git a/arch/m68k-amiga/hidd/uaegfx/uaegfx_hidd.h b/arch/m68k-amiga/hidd/uaegfx/uaegfx_hidd.h new file mode 100644 index 0000000000..05b12edf20 --- /dev/null +++ b/arch/m68k-amiga/hidd/uaegfx/uaegfx_hidd.h @@ -0,0 +1,3 @@ + +#define UAEGFX_LIBNAME "uaegfx.hidd" +#define CLID_Hidd_Gfx_UAE "hidd.gfx.uae" diff --git a/arch/m68k-amiga/hidd/uaegfx/uaegfx.c b/arch/m68k-amiga/hidd/uaegfx/uaegfx_hiddclass.c similarity index 99% rename from arch/m68k-amiga/hidd/uaegfx/uaegfx.c rename to arch/m68k-amiga/hidd/uaegfx/uaegfx_hiddclass.c index c8be0d18a9..1f869bb068 100644 --- a/arch/m68k-amiga/hidd/uaegfx/uaegfx.c +++ b/arch/m68k-amiga/hidd/uaegfx/uaegfx_hiddclass.c @@ -1,8 +1,8 @@ /* - Copyright 1995-2015, The AROS Development Team. All rights reserved. + Copyright 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: + Desc: UAE Gfx Hidd Lang: English. */ @@ -22,14 +22,14 @@ #include #include -#include +#include #include #include LC_LIBDEFS_FILE -#include "uaegfx.h" -#include "uaegfxbitmap.h" +#include "uaegfx_intern.h" +#include "uaegfx_bitmap.h" #include "uaertg.h" #define SDEBUG 0 @@ -950,7 +950,7 @@ BOOL UAEGFXCl__Hidd_Gfx__CheckMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf static void freeattrbases(LIBBASETYPEPTR LIBBASE, struct uaegfx_staticdata *csd) { OOP_ReleaseAttrBase(IID_Hidd_BitMap); - OOP_ReleaseAttrBase(IID_Hidd_UAEGFXBitMap); + OOP_ReleaseAttrBase(IID_Hidd_BitMap_UAE); OOP_ReleaseAttrBase(IID_Hidd_GC); OOP_ReleaseAttrBase(IID_Hidd_Sync); OOP_ReleaseAttrBase(IID_Hidd_Gfx); @@ -1245,7 +1245,7 @@ BOOL Init_UAEGFXClass(LIBBASETYPEPTR LIBBASE) mc->mc_Bytes = csd->vmem->mh_Free; __IHidd_BitMap = OOP_ObtainAttrBase(IID_Hidd_BitMap); - __IHidd_UAEGFXBitmap= OOP_ObtainAttrBase(IID_Hidd_UAEGFXBitMap); + __IHidd_BitMap_UAE = OOP_ObtainAttrBase(IID_Hidd_BitMap_UAE); __IHidd_GC = OOP_ObtainAttrBase(IID_Hidd_GC); __IHidd_Sync = OOP_ObtainAttrBase(IID_Hidd_Sync); __IHidd_Gfx = OOP_ObtainAttrBase(IID_Hidd_Gfx); @@ -1256,7 +1256,7 @@ BOOL Init_UAEGFXClass(LIBBASETYPEPTR LIBBASE) HiddColorMapBase = OOP_GetMethodID(IID_Hidd_ColorMap, 0); HiddGfxBase = OOP_GetMethodID(IID_Hidd_Gfx, 0); - if (!__IHidd_BitMap || !__IHidd_UAEGFXBitmap || !__IHidd_GC || + if (!__IHidd_BitMap || !__IHidd_BitMap_UAE || !__IHidd_GC || !__IHidd_Sync || !__IHidd_Gfx || !__IHidd_PixFmt || !__IHidd_ColorMap) { D(bug("Init_UAEGFXClass fail\n")); diff --git a/arch/m68k-amiga/hidd/uaegfx/uaegfx.h b/arch/m68k-amiga/hidd/uaegfx/uaegfx_intern.h similarity index 96% rename from arch/m68k-amiga/hidd/uaegfx/uaegfx.h rename to arch/m68k-amiga/hidd/uaegfx/uaegfx_intern.h index 7ce9fed46d..8c347a94ac 100644 --- a/arch/m68k-amiga/hidd/uaegfx/uaegfx.h +++ b/arch/m68k-amiga/hidd/uaegfx/uaegfx_intern.h @@ -5,10 +5,10 @@ #include #include -#include "uaegfxclass.h" +#include "uaegfx_hidd.h" #define __IHidd_BitMap (csd->hiddBitMapAttrBase) -#define __IHidd_UAEGFXBitmap (csd->hiddUAEGFXBitMapAttrBase) +#define __IHidd_BitMap_UAE (csd->hiddUAEGFXBitMapAttrBase) #define __IHidd_GC (csd->hiddGCAttrBase) #define __IHidd_Sync (csd->hiddSyncAttrBase) #define __IHidd_PixFmt (csd->hiddPixFmtAttrBase) @@ -20,7 +20,7 @@ #define HiddColorMapBase (csd->hiddColorMapBase) #define HiddGfxBase (csd->hiddGfxBase) -#include +#include #define UtilityBase ((csd)->cs_UtilityBase) diff --git a/arch/m68k-amiga/hidd/uaegfx/uaegfxclass.h b/arch/m68k-amiga/hidd/uaegfx/uaegfxclass.h deleted file mode 100644 index b6672289c1..0000000000 --- a/arch/m68k-amiga/hidd/uaegfx/uaegfxclass.h +++ /dev/null @@ -1,3 +0,0 @@ - -#define UAEGFX_LIBNAME "uaegfx.hidd" -#define CLID_Hidd_UAEGfx "hidd.gfx.uaegfx" diff --git a/arch/m68k-amiga/hidd/uaegfx/uaertg.c b/arch/m68k-amiga/hidd/uaegfx/uaertg.c index e11a9cbd13..7350ce103e 100644 --- a/arch/m68k-amiga/hidd/uaegfx/uaertg.c +++ b/arch/m68k-amiga/hidd/uaegfx/uaertg.c @@ -1,18 +1,18 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include #include #include -#include +#include #include #include #include -#include "uaegfx.h" -#include "uaegfxbitmap.h" +#include "uaegfx_intern.h" +#include "uaegfx_bitmap.h" #include "uaertg.h" #include "p96call.h" diff --git a/arch/ppc-chrp/hidd.radeon/radeon_bios.c b/arch/ppc-chrp/hidd.radeon/radeon_bios.c index 8c1d3b575a..9fdca8da80 100644 --- a/arch/ppc-chrp/hidd.radeon/radeon_bios.c +++ b/arch/ppc-chrp/hidd.radeon/radeon_bios.c @@ -1,5 +1,5 @@ /* - Copyright � 2004-2007, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: ATI radeon driver. BIOS part. @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/arch/ppc-sam440/boot/menu.lst b/arch/ppc-sam440/boot/menu.lst index 88b24de261..0385f588b9 100644 --- a/arch/ppc-sam440/boot/menu.lst +++ b/arch/ppc-sam440/boot/menu.lst @@ -24,7 +24,7 @@ title AROS on Sam4x0 module L/fat-handler module Devs/FileSystem.resource module Devs/gameport.device - module Devs/Drivers/graphics.hidd + module Devs/Drivers/gfx.hidd module Libs/graphics.library module Devs/Drivers/hiddclass.hidd module Classes/USB/hid.class @@ -52,7 +52,7 @@ title AROS on Sam4x0 module L/sfs-handler module Devs/shell.resource module Devs/shellcommands.resource - module Devs/Drivers/sm502.hidd + module Devs/Drivers/sm502gfx.hidd module boot/sam440/Devs/timer.device module Devs/usbromstartup.resource module Libs/utility.library @@ -79,7 +79,7 @@ title AROS on Sam4x0 Debug module L/fat-handler module Devs/FileSystem.resource module Devs/gameport.device - module Devs/Drivers/graphics.hidd + module Devs/Drivers/gfx.hidd module Libs/graphics.library module Devs/Drivers/hiddclass.hidd module Classes/USB/hid.class @@ -107,7 +107,7 @@ title AROS on Sam4x0 Debug module L/sfs-handler module Devs/shell.resource module Devs/shellcommands.resource - module Devs/Drivers/sm502.hidd + module Devs/Drivers/sm502gfx.hidd module boot/sam440/Devs/timer.device module Devs/usbromstartup.resource module Libs/utility.library @@ -132,7 +132,7 @@ title AROS on Sam4x0 Test Alternative Usb module L/fat-handler module Devs/FileSystem.resource module Devs/gameport.device - module Devs/Drivers/graphics.hidd + module Devs/Drivers/gfx.hidd module Libs/graphics.library module Devs/Drivers/hiddclass.hidd module Classes/USB/hid.hidd @@ -155,7 +155,7 @@ title AROS on Sam4x0 Test Alternative Usb module Devs/Drivers/pci.hidd module boot/sam440/Devs/processor.resource module L/sfs-handler - module Devs/Drivers/sm502.hidd + module Devs/Drivers/sm502gfx.hidd module boot/sam440/Devs/timer.device module Devs/Drivers/usb.hidd module Libs/utility.library diff --git a/arch/ppc-sam440/boot/mmakefile.src b/arch/ppc-sam440/boot/mmakefile.src index fecd737b35..197456924c 100644 --- a/arch/ppc-sam440/boot/mmakefile.src +++ b/arch/ppc-sam440/boot/mmakefile.src @@ -59,7 +59,7 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-hidd-graphics \ #MM kernel-hidd-kbd \ #MM kernel-hidd-mouse \ -#MM kernel-hidd-sm502 \ +#MM hidd-sm502gfx \ #MM kernel-usb-sam440-ppc \ #MM kernel-usb-usbromstartup \ #MM kernel-processor \ diff --git a/arch/ppc-sam440/hidd.radeon/radeon_bios.c b/arch/ppc-sam440/hidd.radeon/radeon_bios.c index 2c246bf668..ede43c742e 100644 --- a/arch/ppc-sam440/hidd.radeon/radeon_bios.c +++ b/arch/ppc-sam440/hidd.radeon/radeon_bios.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2007, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: ATI radeon driver. BIOS part. @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/arch/x86_64-pc/boot/mmakefile.src b/arch/x86_64-pc/boot/mmakefile.src index cb1f3e897b..809767f1e0 100644 --- a/arch/x86_64-pc/boot/mmakefile.src +++ b/arch/x86_64-pc/boot/mmakefile.src @@ -46,7 +46,7 @@ KLIBS := acpica KLIBS_ARCH := expansion KDEVS := ata ahci KDEVS_ARCH := timer -KHIDDS := parallel pci pcipc serial vesagfx vgah storage system ata_pci i8042 +KHIDDS := parallel pci pcipc serial vesagfx vgagfx storage system ata_pci i8042 %make_package mmake=kernel-bsp-pc-x86_64 file=$(AROSARCHDIR)/aros-bsp.pkg \ devs=$(KDEVS) arch_devs=$(KDEVS_ARCH) hidds=$(KHIDDS) libs=$(KLIBS) \ diff --git a/boot/modular_kickstart.txt b/boot/modular_kickstart.txt index a78eb443f0..4725ee9500 100644 --- a/boot/modular_kickstart.txt +++ b/boot/modular_kickstart.txt @@ -29,7 +29,7 @@ functional difference between ELF and PKG forms. ram-handler con-handler hiddclass.hidd - graphics.hidd + gfx.hidd keyboard.hidd mouse.hidd aros.library diff --git a/rom/graphics/adddisplaydrivera.c b/rom/graphics/adddisplaydrivera.c index 5591fb5e50..c775b1f7b9 100644 --- a/rom/graphics/adddisplaydrivera.c +++ b/rom/graphics/adddisplaydrivera.c @@ -271,7 +271,7 @@ */ if (ret == DD_OK) { - OOP_Object *gfxhidd = OOP_NewObject(gfxclass, NULL, attrs); + OOP_Object *gfxhidd = HW_AddDriver(PrivGBase(GfxBase)->GfxRoot, gfxclass, attrs); if (gfxhidd) { diff --git a/rom/graphics/allocspritedataa.c b/rom/graphics/allocspritedataa.c index f7a2a1eb48..a22dc232ee 100644 --- a/rom/graphics/allocspritedataa.c +++ b/rom/graphics/allocspritedataa.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2010, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function AllocSpriteDataA() @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/rom/graphics/bestmodeida.c b/rom/graphics/bestmodeida.c index c8666c2b9d..bdfbf5a474 100644 --- a/rom/graphics/bestmodeida.c +++ b/rom/graphics/bestmodeida.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function BestModeIDA() @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/rom/graphics/changevpbitmap.c b/rom/graphics/changevpbitmap.c index a86b4e182b..0467ccc634 100644 --- a/rom/graphics/changevpbitmap.c +++ b/rom/graphics/changevpbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function ChangeVPBitMap() @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "graphics_intern.h" #include "gfxfuncsupport.h" diff --git a/rom/graphics/compositor_driver.h b/rom/graphics/compositor_driver.h index 6d29ee32b9..8620fe1700 100644 --- a/rom/graphics/compositor_driver.h +++ b/rom/graphics/compositor_driver.h @@ -1,5 +1,5 @@ #include -#include +#include #include /* Inline stubs for calling the driver */ diff --git a/rom/graphics/dispinfo.c b/rom/graphics/dispinfo.c index 44e825640b..42214cd40b 100644 --- a/rom/graphics/dispinfo.c +++ b/rom/graphics/dispinfo.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/rom/graphics/fakegfxhidd.c b/rom/graphics/fakegfxhidd.c index 7e1c367f5d..8d92b9c676 100644 --- a/rom/graphics/fakegfxhidd.c +++ b/rom/graphics/fakegfxhidd.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/rom/graphics/finddisplayinfo.c b/rom/graphics/finddisplayinfo.c index b1be9ce3a7..1b07c4832f 100644 --- a/rom/graphics/finddisplayinfo.c +++ b/rom/graphics/finddisplayinfo.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2010, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function FindDisplayInfo() @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "graphics_intern.h" #include "dispinfo.h" diff --git a/rom/graphics/freevportcoplists.c b/rom/graphics/freevportcoplists.c index 15d3f4592e..8ca02aac52 100644 --- a/rom/graphics/freevportcoplists.c +++ b/rom/graphics/freevportcoplists.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function FreeVPortCopLists() @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/rom/graphics/getdisplayinfodata.c b/rom/graphics/getdisplayinfodata.c index de633d6ae5..25041164d0 100644 --- a/rom/graphics/getdisplayinfodata.c +++ b/rom/graphics/getdisplayinfodata.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function GetDisplayInfoData() @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/rom/graphics/getvpmodeid.c b/rom/graphics/getvpmodeid.c index 735f0134ad..1de053551d 100644 --- a/rom/graphics/getvpmodeid.c +++ b/rom/graphics/getvpmodeid.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2010, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function GetVPModeID() @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include "graphics_intern.h" diff --git a/rom/graphics/gfxfuncsupport.h b/rom/graphics/gfxfuncsupport.h index beb22c32b4..e1012276a0 100644 --- a/rom/graphics/gfxfuncsupport.h +++ b/rom/graphics/gfxfuncsupport.h @@ -4,7 +4,7 @@ /****************************************************************************************/ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -12,7 +12,7 @@ #include #include -#include +#include #define PEN_BITS 8 #define NUM_COLORS (1L << PEN_BITS) @@ -55,7 +55,7 @@ do \ (HIDD_BM_DRVDATA(bitmap)->id | HIDD_BM_HIDDMODE(bitmap)) /* An idea for future Amiga(tm) chipset driver: it should be implemented in - architecture-specific part of graphics.hidd. In this case many things will + architecture-specific part of gfx.hidd. In this case many things will start working automatically */ #define GET_VP_DRIVERDATA(vp) \ ((vp->ColorMap && vp->ColorMap->NormalDisplayInfo) \ diff --git a/rom/graphics/graphics.conf b/rom/graphics/graphics.conf index d6f3322bbd..caec997cf1 100644 --- a/rom/graphics/graphics.conf +++ b/rom/graphics/graphics.conf @@ -1,5 +1,5 @@ ##begin config -version 41.5 +version 45.0 libbase GfxBase libbasetype struct GfxBase_intern sysbase_field gfxbase.ExecBase diff --git a/rom/graphics/graphics_driver.c b/rom/graphics/graphics_driver.c index 856b00c333..f7fe4d0045 100644 --- a/rom/graphics/graphics_driver.c +++ b/rom/graphics/graphics_driver.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Driver for using gfxhidd for gfx output @@ -35,7 +35,7 @@ #include #include -#include +#include #include @@ -50,7 +50,7 @@ #include "gfxfuncsupport.h" #include "fontsupport.h" -#define DEBUG_INIT(x) +#define DEBUG_INIT(x) x #define DEBUG_LOADVIEW(x) /* Define this if you wish to enforce using software mouse sprite @@ -90,7 +90,7 @@ int driver_init(struct GfxBase * GfxBase) EnterFunc(bug("driver_init()\n")); /* Our underlying RTG subsystem core must be already up and running */ - if (!OpenLibrary("graphics.hidd", 0)) + if (!OpenLibrary("gfx.hidd", 0)) return FALSE; /* Initialize the semaphores */ diff --git a/rom/graphics/graphics_init.c b/rom/graphics/graphics_init.c index ffaf1d6d79..38e74fae28 100644 --- a/rom/graphics/graphics_init.c +++ b/rom/graphics/graphics_init.c @@ -44,13 +44,18 @@ AROS_INTP(TOF_VBlank); BOOL InitROMFont(struct GfxBase *); static int GfxInit(struct GfxBase *LIBBASE) -{ +{ + bug("[graphics.library] %s()\n", __func__); + + HWBase = OOP_GetMethodID(IID_HW, 0); HiddBitMapBase = OOP_GetMethodID(IID_Hidd_BitMap, 0); HiddColorMapBase = OOP_GetMethodID(IID_Hidd_ColorMap, 0); HiddGfxBase = OOP_GetMethodID(IID_Hidd_Gfx, 0); HiddGCBase = OOP_GetMethodID(IID_Hidd_GC, 0); HiddPlanarBMBase = OOP_GetMethodID(IID_Hidd_PlanarBM, 0); + bug("[graphics.library] %s: obtained method bases\n", __func__); + NEWLIST(&LIBBASE->BlitWaitQ); NEWLIST(&LIBBASE->TextFonts); InitSemaphore( &PrivGBase(GfxBase)->hashtab_sema ); @@ -63,6 +68,8 @@ static int GfxInit(struct GfxBase *LIBBASE) GfxBase->MonitorListSemaphore = &PrivGBase(GfxBase)->monitors_sema; InitSemaphore(GfxBase->MonitorListSemaphore); + bug("[graphics.library] %s: semaphores initialized\n", __func__); + LIBBASE->hash_table = AllocMem(GFXASSOCIATE_HASHSIZE * sizeof(APTR), MEMF_CLEAR|MEMF_PUBLIC); if (!LIBBASE->hash_table) return FALSE; @@ -76,7 +83,7 @@ static int GfxInit(struct GfxBase *LIBBASE) LIBBASE->MaxDisplayRow = AROS_NOMINAL_HEIGHT; PrivGBase(LIBBASE)->basebm = OOP_FindClass(CLID_Hidd_BitMap); - D(bug("[Gfx] BitMap class @ 0x%p\n", PrivGBase(LIBBASE)->basebm)); + bug("[graphics.library] %s: BitMap class @ 0x%p\n", __func__, PrivGBase(LIBBASE)->basebm); #if REGIONS_USE_MEMPOOL InitSemaphore( &PrivGBase(GfxBase)->regionsem ); @@ -90,8 +97,18 @@ static int GfxInit(struct GfxBase *LIBBASE) NEWLIST(&PrivGBase(GfxBase)->ChunkPoolList); #endif + bug("[graphics.library] %s: Initialise ROMFont...\n", __func__); + if (!InitROMFont(LIBBASE)) return FALSE; + bug("[graphics.library] %s: Obtaining Gfx HW Root..\n", __func__); + + PrivGBase(GfxBase)->GfxRoot = OOP_NewObject(NULL, CLID_HW_Gfx, NULL); + + bug("[graphics.library] %s: Gfx HW Root @ 0x%p\n", __func__, PrivGBase(GfxBase)->GfxRoot); + + bug("[graphics.library] %s: Initialise driver...\n", __func__); + return driver_init (LIBBASE); } diff --git a/rom/graphics/graphics_intern.h b/rom/graphics/graphics_intern.h index cc88d2b9f7..77252919e3 100644 --- a/rom/graphics/graphics_intern.h +++ b/rom/graphics/graphics_intern.h @@ -1,13 +1,21 @@ #ifndef GRAPHICS_INTERN_H #define GRAPHICS_INTERN_H /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Internal header file for graphics.library Lang: english */ +#ifndef __OOP_NOMETHODBASES__ +#define __OOP_NOMETHODBASES__ +#endif + +#ifndef __OOP_NOATTRBASES__ +#define __OOP_NOATTRBASES__ +#endif + #include #include #include @@ -19,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -196,7 +204,11 @@ struct GfxBase_intern /* Private library bases */ struct Library *CyberGfxBase; + /* HW Driver root */ + OOP_Object *GfxRoot; + /* Private HIDD method bases */ + OOP_MethodID HWBase; OOP_MethodID HiddBitMapBase; OOP_MethodID HiddColorMapBase; OOP_MethodID HiddGCBase; @@ -215,6 +227,7 @@ struct GfxBase_intern /* FIXME: Remove these #define xxxBase hacks Do not use this in new code ! */ +#define HWBase (PrivGBase(GfxBase)->HWBase) #define HiddBitMapBase (PrivGBase(GfxBase)->HiddBitMapBase) #define HiddColorMapBase (PrivGBase(GfxBase)->HiddColorMapBase) #define HiddGCBase (PrivGBase(GfxBase)->HiddGCBase) diff --git a/rom/graphics/nextdisplayinfo.c b/rom/graphics/nextdisplayinfo.c index 7c76fe1fb0..3d55dd3537 100644 --- a/rom/graphics/nextdisplayinfo.c +++ b/rom/graphics/nextdisplayinfo.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2010, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics function NextDisplayInfo() Lang: english */ #include -#include +#include #include #include "graphics_intern.h" #include "dispinfo.h" diff --git a/rom/graphics/updatebitmap.c b/rom/graphics/updatebitmap.c index ec1b6f0747..ddb5c8f1d4 100644 --- a/rom/graphics/updatebitmap.c +++ b/rom/graphics/updatebitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 2011-2013, The AROS Development Team. All rights reserved. + Copyright © 2011-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Update specified region of the bitmap, taking software composition into account. @@ -11,7 +11,7 @@ #include "compositor_driver.h" #include "gfxfuncsupport.h" -#include +#include AROS_LH5(void, UpdateBitMap, AROS_LHA(struct BitMap *, bitmap, A0), diff --git a/rom/hidds/graphics/OverlayClass.c b/rom/hidds/graphics/OverlayClass.c index 5d2204d5d3..4d0fe4c463 100644 --- a/rom/hidds/graphics/OverlayClass.c +++ b/rom/hidds/graphics/OverlayClass.c @@ -17,7 +17,7 @@ --background_overlay-- LOCATION - hidd.graphics.overlay + hidd.gfx.overlay NOTES Objects of overlay class represent hardware video overlays. @@ -25,7 +25,7 @@ Current hardware supports only one video overlay per screen, however in future the situation may change. - hidd.graphics.overlay is an interface name. There's no such public ID since + hidd.gfx.overlay is an interface name. There's no such public ID since there's actually no base class for the overlay. The whole implementation is hardware-dependant and needs to be done separately for every driver. @@ -44,7 +44,7 @@ [I..], ULONG LOCATION - hidd.graphics.overlay + hidd.gfx.overlay FUNCTION Specifies source data width in pixels. @@ -71,7 +71,7 @@ [I..], ULONG LOCATION - hidd.graphics.overlay + hidd.gfx.overlay FUNCTION Specifies source data height in pixels. @@ -98,7 +98,7 @@ [I..], ULONG LOCATION - hidd.graphics.overlay + hidd.gfx.overlay FUNCTION Specifies source data pixel format. The value should be one of SRCFMT_... constants @@ -132,7 +132,7 @@ [I..], ULONG * LOCATION - hidd.graphics.overlay + hidd.gfx.overlay FUNCTION Specifies a pointer to ULONG location where error code will be written. diff --git a/rom/hidds/graphics/colorconv_init.c b/rom/hidds/graphics/colorconv_init.c index 5fededc4bf..fd6b9ea248 100644 --- a/rom/hidds/graphics/colorconv_init.c +++ b/rom/hidds/graphics/colorconv_init.c @@ -9,7 +9,7 @@ #include #include -#include "graphics_intern.h" +#include "gfx_intern.h" #include LC_LIBDEFS_FILE diff --git a/rom/hidds/graphics/graphics.conf b/rom/hidds/graphics/gfx.conf similarity index 97% rename from rom/hidds/graphics/graphics.conf rename to rom/hidds/graphics/gfx.conf index c0b49cc8b6..6f4ae84102 100644 --- a/rom/hidds/graphics/graphics.conf +++ b/rom/hidds/graphics/gfx.conf @@ -1,25 +1,43 @@ ##begin config -basename GFX +basename GFXHW libbasetype struct IntHIDDGraphicsBase -version 42.4 +version 45.0 residentpri 66 -classid CLID_Hidd_Gfx -superclass CLID_Hidd -classptr_field hdg_csd.gfxhiddclass -classdatatype struct HIDDGraphicsData +classid CLID_HW_Gfx +superclass CLID_HW +classptr_field hdg_csd.gfxhwclass +classdatatype struct HWGfxData oopbase_field hdg_csd.cs_OOPBase seglist_field hdg_csd.cs_SegList ##end config ##begin cdefprivate -#include -#include "graphics_intern.h" +#include +#include "gfx_intern.h" ##end cdefprivate ##begin methodlist .interface Root New Dispose +##end methodlist + + +##begin class +##begin config +basename GFXHIDD +type hidd +initpri 1 +classid CLID_Hidd_Gfx +superclass CLID_Hidd +classptr_field hdg_csd.gfxhiddclass +classdatatype struct HiddGfxData +##end config + +##begin methodlist +.interface Root +New +Dispose Get .interface Hidd_Gfx NominalDimensions @@ -51,6 +69,7 @@ MakeViewPort CleanViewPort PrepareViewPorts ##end methodlist +##end class ##begin class @@ -280,7 +299,7 @@ ReleaseDirectAccess ##begin interface ##begin config -interfaceid hidd.graphics.graphics +interfaceid hidd.gfx.driver interfacename Hidd_Gfx methodstub HIDD_Gfx methodbase HiddGfxBase @@ -344,7 +363,7 @@ BOOL CopyBoxMasked(OOP_Object *src, WORD srcX, WORD srcY, OOP_Object *dest, WORD ##begin interface ##begin config -interfaceid graphics.hidd.bitmap +interfaceid hidd.gfx.bitmap interfacename Hidd_BitMap methodstub HIDD_BM methodbase HiddBitMapBase @@ -540,7 +559,7 @@ APTR Buffer ##begin interface ##begin config -interfaceid hidd.graphics.colormap +interfaceid hidd.gfx.colormap interfacename Hidd_ColorMap methodstub HIDD_CM methodbase HiddColorMapBase @@ -599,7 +618,7 @@ ULONG BoardNumber # [I..] Number of board (for '%b' in description) ##begin interface ##begin config -interfaceid hidd.graphics.overlay +interfaceid hidd.gfx.overlay interfacename Hidd_Overlay ##end config diff --git a/rom/hidds/graphics/BM_Class.c b/rom/hidds/graphics/gfx_bitmapclass.c similarity index 98% rename from rom/hidds/graphics/BM_Class.c rename to rom/hidds/graphics/gfx_bitmapclass.c index 27651b541c..67db26d0d9 100644 --- a/rom/hidds/graphics/BM_Class.c +++ b/rom/hidds/graphics/gfx_bitmapclass.c @@ -1,17 +1,14 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Graphics bitmap class implementation. + Desc: Gfx BitMap class implementation. Lang: english */ /****************************************************************************************/ -#define SDEBUG 0 -#define DEBUG 0 -#define DPUTPATTERN(x) -#define DUPDATE(x) +#include "gfx_debug.h" #include #include @@ -23,13 +20,12 @@ #include #include #include -#include +#include #include #include - -#include "graphics_intern.h" +#include "gfx_intern.h" /****************************************************************************************/ @@ -45,7 +41,7 @@ --background_bitmap-- LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap NOTES Every display driver should implement at least one bitmap class for displayable @@ -139,7 +135,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [ISG], UWORD LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specifies bitmap width in pixels. @@ -170,7 +166,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [ISG], UWORD LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specifies bitmap height in pixels. @@ -201,7 +197,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I.G], BOOL LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION The bitmap is displayable. A displayable bitmap is always managed by a display @@ -232,7 +228,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [..G], BOOL LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Check if the bitmap is currently visible on screen @@ -263,7 +259,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [..G], BOOL LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Check if the bitmap provides linear memory access. This means that bitmap's @@ -300,7 +296,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [ISG], ULONG LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify or query number of bytes per row in the bitmap storage buffer. @@ -337,7 +333,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [..G], OOP_Object * LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Return associated colormap (palette) object. @@ -371,7 +367,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I.G], OOP_Object * LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify a friend bitmap. The bitmap will be allocated so that it @@ -405,7 +401,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I.G], OOP_Object * LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify display driver object this bitmap was created with. @@ -441,7 +437,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I..], HIDDT_StdPixFmt LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify standard pixelformat code (one of vHidd_StdPixFmt_... values) for the @@ -487,7 +483,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I.G], OOP_Object * LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify or query pixelformat descriptor object associated with the bitmap. @@ -519,7 +515,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [ISG], HIDDT_ModeID LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify display mode ID for displayable bitmap. @@ -559,7 +555,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I..], OOP_Class * LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Explicitly specify bitmap's class pointer. @@ -597,7 +593,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I..] LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Explicitly specify bitmap's class ID. @@ -633,7 +629,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [...] LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Private, very obsolete and currently has no function. Considered reserved. @@ -659,7 +655,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I.G], BOOL LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specifies that the bitmap is a framebuffer bitmap. @@ -691,7 +687,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [.SG] LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Controls horizontal position of a scrollable screen bitmap. @@ -738,7 +734,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [.SG] LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Controls vertical position of a scrollable screen bitmap. @@ -781,7 +777,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [I.G] LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify number of pixels to align bitmap data width to. @@ -817,7 +813,7 @@ static BOOL DoBufferedOperation(OOP_Class *cl, OOP_Object *o, UWORD startx, UWOR [G.I] LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Specify or query the actual bitmap depth. @@ -1129,7 +1125,7 @@ void BM__Root__Dispose(OOP_Class *cl, OOP_Object *obj, OOP_Msg *msg) /* Release the previously registered pixel format */ if (data->pf_registered) - GFX__Hidd_Gfx__ReleasePixFmt(CSD(cl)->gfxhiddclass, data->prot.pixfmt); + GFXHIDD__Hidd_Gfx__ReleasePixFmt(CSD(cl)->gfxhiddclass, data->prot.pixfmt); OOP_DoSuperMethod(cl, obj, (OOP_Msg) msg); @@ -1251,7 +1247,7 @@ VOID BM__Root__Get(OOP_Class *cl, OOP_Object *obj, struct pRoot_Get *msg) UWORD firstColor, UWORD numColors); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Sets values for one or more colors in the colormap object associated with the @@ -1327,7 +1323,7 @@ BOOL BM__Hidd_BitMap__SetColors(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMa if (data->visible) { - ret = GFX__Hidd_Gfx__SetFBColors(CSD(cl)->gfxhiddclass, data->gfxhidd, msg); + ret = GFXHIDD__Hidd_Gfx__SetFBColors(CSD(cl)->gfxhiddclass, data->gfxhidd, msg); } ReleaseSemaphore(&data->lock); @@ -1348,7 +1344,7 @@ BOOL BM__Hidd_BitMap__SetColors(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMa HIDDT_Pixel pixel); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Sets a new color value for the pixel at (x,y). The actual color stored @@ -1388,7 +1384,7 @@ BOOL BM__Hidd_BitMap__SetColors(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMa VOID HIDD_BM_DrawPixel(OOP_Object *obj, OOP_Object *gc, WORD x, WORD y); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Changes the pixel at (x,y). The color of the pixel depends on the @@ -1498,7 +1494,7 @@ VOID BM__Hidd_BitMap__DrawPixel(OOP_Class *cl, OOP_Object *obj, WORD x2, WORD y2); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Draws a line from (x1,y1) to (x2,y2) in the specified gc. @@ -1769,7 +1765,7 @@ VOID BM__Hidd_BitMap__DrawLine WORD maxX, WORD maxY); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Draws a hollow rectangle. minX and minY specifies the upper @@ -1834,7 +1830,7 @@ VOID BM__Hidd_BitMap__DrawRect(OOP_Class *cl, OOP_Object *obj, WORD maxX, WORD maxY); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -1901,7 +1897,7 @@ VOID BM__Hidd_BitMap__FillRect(OOP_Class *cl, OOP_Object *obj, WORD rx, WORD ry); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Draws a hollow ellipse from the center point (x,y) with the radii @@ -2064,7 +2060,7 @@ VOID BM__Hidd_BitMap__DrawEllipse(OOP_Class *cl, OOP_Object *obj, WORD ry, WORD rx); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Draws a solid ellipse from the center point (x,y) with the radii @@ -2171,7 +2167,7 @@ VOID BM__Hidd_BitMap__FillEllipse(OOP_Class *cl, OOP_Object *obj, VOID HIDD_BM_DrawPolygon (OOP_Object *obj, OOP_Object *gc, UWORD n, WORD *coords); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Draws a hollow polygon from the list of coordinates in coords[]. @@ -2231,7 +2227,7 @@ VOID BM__Hidd_BitMap__DrawPolygon(OOP_Class *cl, OOP_Object *obj, VOID HIDD_BM_FillPolygon (OOP_Object *obj, OOP_Object *gc, UWORD n, WORD *coords); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION This method was initially designed for drawing solid polygons, however it was never @@ -2279,7 +2275,7 @@ VOID BM__Hidd_BitMap__FillPolygon(OOP_Class *cl, OOP_Object *obj, struct pHidd_B STRPTR text, UWORD length); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Draws the first length characters of text at (x, y). @@ -2401,7 +2397,7 @@ VOID BM__Hidd_BitMap__DrawText(OOP_Class *cl, OOP_Object *obj, STRPTR text, UWORD length); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Historically this method was designed to draw a text with background. @@ -2450,7 +2446,7 @@ VOID BM__Hidd_BitMap__FillText(OOP_Class *cl, OOP_Object *obj, struct pHidd_BitM VOID OOP_DoMethod(OOP_Object *obj, struct pHidd_BitMap_DrawText *msg); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Reserved, never implemented method. The definition will change in future. @@ -2490,7 +2486,7 @@ VOID BM__Hidd_BitMap__FillSpan(OOP_Class *cl, OOP_Object *obj, struct pHidd_BitM VOID HIDD_BM_Clear (OOP_Object *obj, OOP_Object *gc); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Sets all pixels of the drawing area to the background color. @@ -2591,7 +2587,7 @@ static LONG inline getpixfmtbpp(OOP_Class *cl, OOP_Object *o, HIDDT_StdPixFmt st WORD width, WORD height, HIDDT_StdPixFmt pixFmt); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -2745,7 +2741,7 @@ VOID BM__Hidd_BitMap__GetImage(OOP_Class *cl, OOP_Object *o, WORD x, WORD y, WORD width, WORD height, HIDDT_StdPixFmt pixFmt); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -2954,7 +2950,7 @@ __attribute__((always_inline, const)) do_alpha(int a, int v) WORD x, WORD y, WORD width, WORD height); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Perform an alpha-blending operation between a bitmap and ARGB pixel array. @@ -3113,7 +3109,7 @@ VOID BM__Hidd_BitMap__PutAlphaImage(OOP_Class *cl, OOP_Object *o, WORD srcx, WORD x, WORD y, WORD width, WORD height, BOOL inverttemplate); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Apply a single-bit mask to the given portion of the bitmap. Pixels set to 1 in the mask will be filled @@ -3305,7 +3301,7 @@ VOID BM__Hidd_BitMap__PutTemplate(OOP_Class *cl, OOP_Object *o, struct pHidd_Bit WORD x, WORD y, WORD width, WORD height, BOOL invertalpha); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Perform a drawing with current foreground color, using 8-bit alpha channel mask. The following @@ -3491,7 +3487,7 @@ VOID BM__Hidd_BitMap__PutAlphaTemplate(OOP_Class *cl, OOP_Object *o, WORD width, WORD height); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -3819,7 +3815,7 @@ VOID BM__Hidd_BitMap__PutPattern(OOP_Class *cl, OOP_Object *o, WORD x, WORD y, WORD width, WORD height, HIDDT_PixelLUT *pixlut); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -3944,7 +3940,7 @@ VOID BM__Hidd_BitMap__PutImageLUT(OOP_Class *cl, OOP_Object *o, HIDDT_PixelLUT *pixlut, UBYTE transparent); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Copy an array of 8-bit LUT pixels to the bitmap at the specified position making @@ -4082,7 +4078,7 @@ VOID BM__Hidd_BitMap__PutTranspImageLUT(OOP_Class *cl, OOP_Object *o, WORD width, WORD height, HIDDT_PixelLUT *pixlut); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -4195,7 +4191,7 @@ VOID BM__Hidd_BitMap__GetImageLUT(OOP_Class *cl, OOP_Object *o, UWORD width, UWORD height); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Perform a color expansion of the mask in srcBitMap according to foreground and background @@ -4306,7 +4302,7 @@ else ULONG HIDD_BM_BytesPerLine(OOP_Object *obj, HIDDT_StdPixFmt pixFmt, UWORD width); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION This method is currently not used and reserved. @@ -4501,7 +4497,7 @@ IPTR BM__Root__Set(OOP_Class *cl, OOP_Object *obj, struct pRoot_Set *msg) if (data->visible) { - GFX__Hidd_Gfx__UpdateFB(CSD(cl)->gfxhiddclass, data->gfxhidd, + GFXHIDD__Hidd_Gfx__UpdateFB(CSD(cl)->gfxhiddclass, data->gfxhidd, obj, data->display.MinX, data->display.MinY, 0, 0, data->displayWidth, data->displayHeight); } @@ -4525,7 +4521,7 @@ IPTR BM__Root__Set(OOP_Class *cl, OOP_Object *obj, struct pRoot_Set *msg) OOP_Object * HIDD_BM_SetColorMap(OOP_Object *obj, OOP_Object *colorMap); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -4572,7 +4568,7 @@ OOP_Object *BM__Hidd_BitMap__SetColorMap(OOP_Class *cl, OOP_Object *o, HIDDT_Pixel HIDD_BM_MapColor(OOP_Object *obj, HIDDT_Color *color); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -4677,7 +4673,7 @@ HIDDT_Pixel BM__Hidd_BitMap__MapColor(OOP_Class *cl, OOP_Object *o, VOID HIDD_BM_UnmapPixel(OOP_Object *obj, HIDDT_Pixel pixel, HIDDT_Color *color); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -4754,7 +4750,7 @@ VOID BM__Hidd_BitMap__UnmapPixel(OOP_Class *cl, OOP_Object *o, struct pHidd_BitM ULONG *bankSizeReturn, ULONG *memSizeReturn); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -4799,7 +4795,7 @@ BOOL BM__Hidd_BitMap__ObtainDirectAccess(OOP_Class *cl, OOP_Object *o, VOID HIDD_BM_ReleaseDirectAccess(OOP_Object *obj); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -4841,7 +4837,7 @@ VOID BM__Hidd_BitMap__ReleaseDirectAccess(OOP_Class *cl, OOP_Object *o, struct BitScaleArgs * bsa, OOP_Object *gc); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -4955,7 +4951,7 @@ VOID BM__Hidd_BitMap__BitMapScale(OOP_Class * cl, OOP_Object *o, HIDDT_RGBConversionFunction function); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION @@ -5009,7 +5005,7 @@ HIDDT_RGBConversionFunction BM__Hidd_BitMap__SetRGBConversionFunction(OOP_Class VOID HIDD_BM_UpdateRect(OOP_Object *obj, WORD x, WORD y, WORD width, WORD height); LOCATION - hidd.graphics.bitmap + hidd.gfx.bitmap FUNCTION Update displayed image of the given rectangle. @@ -5091,7 +5087,7 @@ VOID BM__Hidd_BitMap__UpdateRect(OOP_Class *cl, OOP_Object *o, struct pHidd_BitM /* Update the intersection region, if any */ if ((xLimit > srcX) && (yLimit > srcY)) { - GFX__Hidd_Gfx__UpdateFB(CSD(cl)->gfxhiddclass, data->gfxhidd, + GFXHIDD__Hidd_Gfx__UpdateFB(CSD(cl)->gfxhiddclass, data->gfxhidd, o, srcX, srcY, srcX - data->display.MinX, srcY - data->display.MinY, xLimit - srcX, yLimit - srcY); @@ -5192,13 +5188,13 @@ void BM__Hidd_BitMap__SetPixFmt(OOP_Class *cl, OOP_Object *o, OOP_Object *pf) /* Already a pixfmt registered? */ if (data->pf_registered) - GFX__Hidd_Gfx__ReleasePixFmt(CSD(cl)->gfxhiddclass, data->prot.pixfmt); + GFXHIDD__Hidd_Gfx__ReleasePixFmt(CSD(cl)->gfxhiddclass, data->prot.pixfmt); /* Remember the new pixelformat */ data->prot.pixfmt = pf; /* - * This pixelformat was obtained using GFX__Hidd_Gfx__RegisterPixFmt(). + * This pixelformat was obtained using GFXHIDD__Hidd_Gfx__RegisterPixFmt(). * It increases number of pixfmt users, so we'll need to release it when * not used any more. */ diff --git a/rom/hidds/graphics/convertpixels.c b/rom/hidds/graphics/gfx_bitmapconvertpixels.c similarity index 99% rename from rom/hidds/graphics/convertpixels.c rename to rom/hidds/graphics/gfx_bitmapconvertpixels.c index d2feeefeda..3fc7827f5e 100644 --- a/rom/hidds/graphics/convertpixels.c +++ b/rom/hidds/graphics/gfx_bitmapconvertpixels.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2010, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include -#include "graphics_intern.h" +#include +#include "gfx_intern.h" /**************************************************************************************** * diff --git a/rom/hidds/graphics/memblit.c b/rom/hidds/graphics/gfx_bitmapmemblit.c similarity index 99% rename from rom/hidds/graphics/memblit.c rename to rom/hidds/graphics/gfx_bitmapmemblit.c index eb22fc04d4..05d475f589 100644 --- a/rom/hidds/graphics/memblit.c +++ b/rom/hidds/graphics/gfx_bitmapmemblit.c @@ -1,15 +1,14 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include -#include "graphics_intern.h" +#include -#define DEBUG 0 -#include +#include "gfx_intern.h" +#include "gfx_debug.h" /****************************************************************************************/ diff --git a/rom/hidds/graphics/chunkybm.c b/rom/hidds/graphics/gfx_chunkybitmapclass.c similarity index 99% rename from rom/hidds/graphics/chunkybm.c rename to rom/hidds/graphics/gfx_chunkybitmapclass.c index 4d05563e51..7721d89e22 100644 --- a/rom/hidds/graphics/chunkybm.c +++ b/rom/hidds/graphics/gfx_chunkybitmapclass.c @@ -1,13 +1,15 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Graphics chunky bitmap class implementation. + Desc: Gfx chunky bitmap class implementation. Lang: english */ /****************************************************************************************/ +#include "gfx_debug.h" + #include #include #include @@ -16,15 +18,12 @@ #include #include -#include +#include -#include "graphics_intern.h" +#include "gfx_intern.h" #include -#define DEBUG 0 -#include - /****************************************************************************************/ OOP_Object *CBM__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) diff --git a/rom/hidds/graphics/CM_Class.c b/rom/hidds/graphics/gfx_colormapclass.c similarity index 98% rename from rom/hidds/graphics/CM_Class.c rename to rom/hidds/graphics/gfx_colormapclass.c index 02e4ad0fd1..d83f9822f7 100644 --- a/rom/hidds/graphics/CM_Class.c +++ b/rom/hidds/graphics/gfx_colormapclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics colormap class implementation. @@ -8,6 +8,8 @@ /****************************************************************************************/ +#include "gfx_debug.h" + #include #include @@ -20,12 +22,9 @@ #include #include -#include - -#include "graphics_intern.h" +#include -#define DEBUG 0 -#include +#include "gfx_intern.h" /***************************************************************************************** diff --git a/rom/hidds/graphics/gfx_debug.h b/rom/hidds/graphics/gfx_debug.h new file mode 100644 index 0000000000..d80a4ac33c --- /dev/null +++ b/rom/hidds/graphics/gfx_debug.h @@ -0,0 +1,18 @@ + +#undef SDEBUG +#undef DEBUG +#define DEBUG 1 +#include + +#define DPUTPATTERN(x) +#define DUPDATE(x) + +#define DCLIP(x) +#define DCURS(x) + +#define DPF(x) +#define DCOPYBOX(x) + +#define DSOFTEV(x) x +#define DSOFTE(x) x +#define DSOFTEDRAW(x) x diff --git a/rom/hidds/graphics/GC_Class.c b/rom/hidds/graphics/gfx_gcclass.c similarity index 95% rename from rom/hidds/graphics/GC_Class.c rename to rom/hidds/graphics/gfx_gcclass.c index a2a71f4e47..69a31dc3cc 100644 --- a/rom/hidds/graphics/GC_Class.c +++ b/rom/hidds/graphics/gfx_gcclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics gc class implementation. @@ -8,6 +8,8 @@ /****************************************************************************************/ +#include "gfx_debug.h" + #include #include @@ -19,15 +21,9 @@ #include #include -#include - -#include "graphics_intern.h" +#include -#undef SDEBUG -#define SDEBUG 0 -#undef DEBUG -#define DEBUG 0 -#include +#include "gfx_intern.h" /***************************************************************************************** @@ -38,7 +34,7 @@ [.SG] LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Foreground color @@ -64,7 +60,7 @@ [.SG] LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Background color @@ -90,7 +86,7 @@ [.SG] LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Draw mode @@ -116,7 +112,7 @@ [.SG] LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Prevents some color bits from changing. @@ -142,7 +138,7 @@ [.SG] LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Pattern for line drawing @@ -168,7 +164,7 @@ [.SG] LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Pattern start bit for line drawing. @@ -194,7 +190,7 @@ [.SG] LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Mode for color expansion @@ -364,7 +360,7 @@ VOID GC__Root__Get(OOP_Class *cl, OOP_Object *obj, struct pRoot_Get *msg) VOID HIDD_GC_SetClipRect(OOP_Object *obj, LONG x1, LONG y1, LONG x2, LONG y2); LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Install a clipping rectangle on a GC. @@ -427,7 +423,7 @@ VOID GC__Hidd_GC__SetClipRect(OOP_Class *cl, OOP_Object *o, struct pHidd_GC_SetC VOID HIDD_GC_UnsetClipRect(OOP_Object *obj); LOCATION - hidd.graphics.gc + hidd.gfx.gc FUNCTION Uninstalls the clipping rectangle (whatever it is) from the GC. diff --git a/rom/hidds/graphics/GraphicsClass.c b/rom/hidds/graphics/gfx_hiddclass.c similarity index 89% rename from rom/hidds/graphics/GraphicsClass.c rename to rom/hidds/graphics/gfx_hiddclass.c index 1014ba0a64..566c47af49 100644 --- a/rom/hidds/graphics/GraphicsClass.c +++ b/rom/hidds/graphics/gfx_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics hidd class implementation. @@ -8,10 +8,7 @@ /****************************************************************************************/ -#define DEBUG 0 -#define SDEBUG 0 -#define DPF(x) -#define DCOPYBOX(x) +#include "gfx_debug.h" #include #include @@ -23,7 +20,7 @@ #include #include -#include "graphics_intern.h" +#include "gfx_intern.h" #include #include @@ -38,7 +35,7 @@ #include LC_LIBDEFS_FILE -#include +#include /***************************************************************************************** @@ -46,7 +43,7 @@ --background_graphics-- LOCATION - hidd.graphics.graphics + hidd.gfx.driver NOTES When working with graphics drivers this is the first object you get. @@ -62,7 +59,7 @@ --display_modes-- LOCATION - hidd.graphics.graphics + hidd.gfx.driver NOTES Each display driver object internally stores a database of supported display mode @@ -111,14 +108,10 @@ *****************************************************************************************/ -static BOOL create_std_pixfmts(struct class_static_data *_csd); -static VOID delete_pixfmts(struct class_static_data *_csd); static BOOL register_modes(OOP_Class *cl, OOP_Object *o, struct TagItem *modetags); static BOOL alloc_mode_db(struct mode_db *mdb, ULONG numsyncs, ULONG numpfs, OOP_Class *cl); static VOID free_mode_db(struct mode_db *mdb, OOP_Class *cl); -static OOP_Object *create_and_init_object(OOP_Class *cl, UBYTE *data, ULONG datasize, - struct class_static_data *_csd); static struct pixfmt_data *find_pixfmt(HIDDT_PixelFormat *tofind , struct class_static_data *_csd); @@ -138,7 +131,7 @@ BOOL parse_pixfmt_tags(struct TagItem *tags, HIDDT_PixelFormat *pf, ULONG attrch /****************************************************************************************/ -OOP_Object *GFX__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +OOP_Object *GFXHIDD__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; struct Library *UtilityBase = CSD(cl)->cs_UtilityBase; @@ -147,15 +140,32 @@ OOP_Object *GFX__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) {aHidd_GC_Foreground, 0}, {TAG_DONE , 0} }; + struct TagItem new_tags[] = + { + {aHidd_Name, 0 }, + {aHidd_HardwareName, 0 }, + {aHidd_ProducerName, 0 }, + {TAG_MORE, (IPTR)msg->attrList } + }; + struct pRoot_New new_msg = + { + .mID = msg->mID, + .attrList = new_tags + }; D(bug("Entering gfx.hidd::New\n")); - o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); + new_tags[0].ti_Data = GetTagData(aHidd_Name, (IPTR)"gfx.hidd", msg->attrList); + new_tags[1].ti_Data = GetTagData(aHidd_HardwareName, (IPTR)"Software Rasterizer", msg->attrList); + new_tags[2].ti_Data = GetTagData(aHidd_ProducerName, (IPTR)"The AROS development team", msg->attrList); + + o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg)&new_msg); + D(bug("Got object o=%x\n", o)); if (o) { - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); struct TagItem *tstate = msg->attrList; struct TagItem *modetags = NULL; struct TagItem *tag; @@ -213,10 +223,10 @@ OOP_Object *GFX__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) /****************************************************************************************/ -VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) +VOID GFXHIDD__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; - struct HIDDGraphicsData *data; + struct HiddGfxData *data; data = OOP_INST_DATA(cl, o); @@ -242,7 +252,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], BOOL LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Tells if the display driver is using hosted display in host OS' window, and mouse @@ -278,7 +288,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [ISG], HIDDT_DPMSLevel LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Gets or sets current DPMS level for driver's display. @@ -316,7 +326,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [I..], struct TagItem * LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Specify a pointer to a taglist which contains description of display modes @@ -447,7 +457,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], ULONG LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Gets total number of sync objects in the internal display mode database. @@ -474,7 +484,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], BOOL LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Tells whether the driver supports hardware mouse pointer sprite. @@ -519,7 +529,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], BOOL LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Tells whether the driver does not need a framebuffer. @@ -550,7 +560,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], BOOL LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Return hardware sprite image types supported by the driver. @@ -595,7 +605,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], ULONG LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Query total size of video card memory in bytes. @@ -622,7 +632,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], ULONG LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Query video card's memory clock in Hz. 0 is a valid value meaning 'unknown'. @@ -649,7 +659,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], STRPTR LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Query CyberGraphX driver name. It is the same name which can be given to @@ -679,7 +689,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [.S.], void (*)(APTR userdata, OOP_Object *bitmap) LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Set display activation interrupt handler. @@ -738,7 +748,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [.S.], APTR LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Set user-defined data pointer for display activation handler. @@ -767,7 +777,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) [..G], OOP_Object * LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Get a pointer to shared default GC object. @@ -801,7 +811,7 @@ VOID GFX__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) static UBYTE get_fbmode(OOP_Class *cl, OOP_Object *o) { - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); if (data->fbmode == -1) { @@ -826,7 +836,7 @@ static UBYTE get_fbmode(OOP_Class *cl, OOP_Object *o) [I.G], UBYTE LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Specifies fixed framebuffer type used by the driver. The value can be one of the following: @@ -876,7 +886,7 @@ static UBYTE get_fbmode(OOP_Class *cl, OOP_Object *o) [..G], UBYTE LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Specifies if the driver supports gamma correction tables. Default implementation @@ -895,10 +905,10 @@ static UBYTE get_fbmode(OOP_Class *cl, OOP_Object *o) *****************************************************************************************/ -VOID GFX__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) +VOID GFXHIDD__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); ULONG idx; Hidd_Gfx_Switch (msg->attrID, idx) @@ -945,7 +955,7 @@ VOID GFX__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) OOP_Object *HIDD_Gfx_NominalDimensions(OOP_Object *gfxHidd, UWORD *width, UWORD *height, UBYTE *depth); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION @@ -965,7 +975,7 @@ VOID GFX__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) INTERNALS *****************************************************************************************/ -VOID GFX__Hidd_Gfx__NominalDimensions(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_NominalDimensions *msg) +VOID GFXHIDD__Hidd_Gfx__NominalDimensions(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_NominalDimensions *msg) { EnterFunc(bug("HIDDGfx::NominalDimensions()\n")); @@ -988,7 +998,7 @@ VOID GFX__Hidd_Gfx__NominalDimensions(OOP_Class *cl, OOP_Object *o, struct pHidd OOP_Object *HIDD_Gfx_CreateObject(OOP_Object *gfxHidd, OOP_Class *cl, struct TagItem *tagList); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Create a driver specific Gfx Object of the type "classID" @@ -1078,10 +1088,10 @@ VOID GFX__Hidd_Gfx__NominalDimensions(OOP_Class *cl, OOP_Object *o, struct pHidd This behavior is subject to change, but will maintain backwards compatibility. *****************************************************************************************/ -OOP_Object *GFX__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) +OOP_Object *GFXHIDD__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); OOP_Object *object = NULL; EnterFunc(bug("HIDDGfx::CreateObject()\n")); @@ -1554,7 +1564,7 @@ static BOOL register_modes(OOP_Class *cl, OOP_Object *o, struct TagItem *modetag struct Library *UtilityBase = CSD(cl)->cs_UtilityBase; struct Library *OOPBase = CSD(cl)->cs_OOPBase; struct TagItem *tag, *tstate; - struct HIDDGraphicsData *data; + struct HiddGfxData *data; MAKE_SYNC(640x480_60, 25174, 640, 656, 752, 800, @@ -1707,7 +1717,7 @@ static BOOL register_modes(OOP_Class *cl, OOP_Object *o, struct TagItem *modetag { case aoHidd_Gfx_PixFmtTags: def_pixfmt_tags[num_Hidd_PixFmt_Attrs].ti_Data = tag->ti_Data; - mdb->pixfmts[pfidx] = GFX__Hidd_Gfx__RegisterPixFmt(cl, def_pixfmt_tags); + mdb->pixfmts[pfidx] = GFXHIDD__Hidd_Gfx__RegisterPixFmt(cl, def_pixfmt_tags); if (NULL == mdb->pixfmts[pfidx]) { @@ -1907,7 +1917,7 @@ static HIDDT_ModeID *querymode(struct modequery *mq) HIDDT_ModeID *HIDD_Gfx_QueryModeIDs(OOP_Object *gfxHidd, struct TagItem *queryTags); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Obtain a table of all supported display mode IDs @@ -1948,14 +1958,14 @@ static HIDDT_ModeID *querymode(struct modequery *mq) *****************************************************************************************/ -HIDDT_ModeID *GFX__Hidd_Gfx__QueryModeIDs(OOP_Class *cl, OOP_Object *o, +HIDDT_ModeID *GFXHIDD__Hidd_Gfx__QueryModeIDs(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_QueryModeIDs *msg) { struct Library *UtilityBase = CSD(cl)->cs_UtilityBase; struct TagItem *tag, *tstate; HIDDT_ModeID *modeids; - struct HIDDGraphicsData *data; + struct HiddGfxData *data; struct mode_db *mdb; struct modequery mq = @@ -2027,7 +2037,7 @@ HIDDT_ModeID *GFX__Hidd_Gfx__QueryModeIDs(OOP_Class *cl, OOP_Object *o, VOID HIDD_Gfx_ReleaseModeIDs(OOP_Object *gfxHidd, HIDDT_ModeID *modeIDs); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Free array of display mode IDs returned by HIDD_Gfx_QueryModeIDs() @@ -2052,7 +2062,7 @@ HIDDT_ModeID *GFX__Hidd_Gfx__QueryModeIDs(OOP_Class *cl, OOP_Object *o, *****************************************************************************************/ -VOID GFX__Hidd_Gfx__ReleaseModeIDs(OOP_Class *cl, OOP_Object *o, +VOID GFXHIDD__Hidd_Gfx__ReleaseModeIDs(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ReleaseModeIDs *msg) { FreeVec(msg->modeIDs); @@ -2070,7 +2080,7 @@ VOID GFX__Hidd_Gfx__ReleaseModeIDs(OOP_Class *cl, OOP_Object *o, OOP_Object **syncPtr, OOP_Object **pixFmtPtr); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Iterate driver's internal display mode database. @@ -2099,10 +2109,10 @@ VOID GFX__Hidd_Gfx__ReleaseModeIDs(OOP_Class *cl, OOP_Object *o, *****************************************************************************************/ -HIDDT_ModeID GFX__Hidd_Gfx__NextModeID(OOP_Class *cl, OOP_Object *o, +HIDDT_ModeID GFXHIDD__Hidd_Gfx__NextModeID(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_NextModeID *msg) { - struct HIDDGraphicsData *data; + struct HiddGfxData *data; struct mode_db *mdb; ULONG syncidx, pfidx; HIDDT_ModeID return_id = vHidd_ModeID_Invalid; @@ -2175,7 +2185,7 @@ HIDDT_ModeID GFX__Hidd_Gfx__NextModeID(OOP_Class *cl, OOP_Object *o, OOP_Object **syncPtr, OOP_Object **pixFmtPtr); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Get sync and pixelformat objects for a particular display ModeID. @@ -2205,10 +2215,10 @@ HIDDT_ModeID GFX__Hidd_Gfx__NextModeID(OOP_Class *cl, OOP_Object *o, *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__GetMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetMode *msg) +BOOL GFXHIDD__Hidd_Gfx__GetMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetMode *msg) { ULONG pfidx, syncidx; - struct HIDDGraphicsData *data; + struct HiddGfxData *data; struct mode_db *mdb; BOOL ok = FALSE; @@ -2251,7 +2261,7 @@ BOOL GFX__Hidd_Gfx__GetMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetMo BOOL HIDD_Gfx_SetMode(OOP_Object *gfxHidd, OOP_Object *sync); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Update display mode according to changed sync object @@ -2280,7 +2290,7 @@ BOOL GFX__Hidd_Gfx__GetMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetMo *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__SetMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetMode *msg) +BOOL GFXHIDD__Hidd_Gfx__SetMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetMode *msg) { return FALSE; } @@ -2291,7 +2301,7 @@ static VOID copy_bm_and_colmap(OOP_Class *cl, OOP_Object *o, OOP_Object *src_bm OOP_Object *dst_bm, UWORD width, UWORD height) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; - struct HIDDGraphicsData *data; + struct HiddGfxData *data; ULONG i; IPTR numentries; OOP_Object *src_colmap; @@ -2345,7 +2355,7 @@ static VOID copy_bm_and_colmap(OOP_Class *cl, OOP_Object *o, OOP_Object *src_bm OOP_Object *HIDD_Gfx_Show(OOP_Object *gfxHidd, OOP_Object *bitMap, ULONG flags); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Change currently displayed bitmap on the screen. @@ -2411,10 +2421,10 @@ static VOID copy_bm_and_colmap(OOP_Class *cl, OOP_Object *o, OOP_Object *src_bm *****************************************************************************************/ -OOP_Object *GFX__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) +OOP_Object *GFXHIDD__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); OOP_Object *bm = msg->bitMap; IPTR oldwidth = 0; IPTR oldheight = 0; @@ -2508,7 +2518,7 @@ OOP_Object *GFX__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_S ULONG HIDD_Gfx_ShowViewPorts(OOP_Object *gfxHidd, struct HIDD_ViewPortData *data, struct View *view); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Show one or more bitmaps on the screen. @@ -2554,7 +2564,7 @@ OOP_Object *GFX__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_S *****************************************************************************************/ -ULONG GFX__Hidd_Gfx__ShowViewPorts(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ShowViewPorts *msg) +ULONG GFXHIDD__Hidd_Gfx__ShowViewPorts(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ShowViewPorts *msg) { /* By default we don't support screen composition (and this method too) */ return FALSE; @@ -2572,7 +2582,7 @@ ULONG GFX__Hidd_Gfx__ShowViewPorts(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf WORD xoffset, WORD yoffset); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Set mouse pointer shape. @@ -2617,7 +2627,7 @@ ULONG GFX__Hidd_Gfx__ShowViewPorts(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__SetCursorShape(OOP_Class *cl, OOP_Object *o, +BOOL GFXHIDD__Hidd_Gfx__SetCursorShape(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorShape *msg) { /* We have no clue how to render the cursor */ @@ -2635,7 +2645,7 @@ BOOL GFX__Hidd_Gfx__SetCursorShape(OOP_Class *cl, OOP_Object *o, VOID HIDD_Gfx_SetCursorVisible(OOP_Object *gfxHidd, BOOL visible); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Control mouse pointer visiblity. @@ -2664,7 +2674,7 @@ BOOL GFX__Hidd_Gfx__SetCursorShape(OOP_Class *cl, OOP_Object *o, *****************************************************************************************/ -VOID GFX__Hidd_Gfx__SetCursorVisible(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorVisible *msg) +VOID GFXHIDD__Hidd_Gfx__SetCursorVisible(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorVisible *msg) { } @@ -2680,7 +2690,7 @@ VOID GFX__Hidd_Gfx__SetCursorVisible(OOP_Class *cl, OOP_Object *o, struct pHidd_ BOOL HIDD_Gfx_SetCursorPos(OOP_Object *gfxHidd, WORD x, WORD y); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Set current mouse pointer position. @@ -2716,7 +2726,7 @@ VOID GFX__Hidd_Gfx__SetCursorVisible(OOP_Class *cl, OOP_Object *o, struct pHidd_ *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorPos *msg) +BOOL GFXHIDD__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_SetCursorPos *msg) { return TRUE; } @@ -2734,7 +2744,7 @@ BOOL GFX__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ OOP_Object *gc); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Perform rectangle copy (blit) operation from one bitmap to another. @@ -2781,7 +2791,7 @@ BOOL GFX__Hidd_Gfx__SetCursorPos(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ *****************************************************************************************/ -VOID GFX__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *obj, struct pHidd_Gfx_CopyBox *msg) +VOID GFXHIDD__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *obj, struct pHidd_Gfx_CopyBox *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; WORD x, y; @@ -3074,7 +3084,7 @@ VOID GFX__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *obj, struct pHidd_Gfx_Cop PLANEPTR mask, OOP_Object *gc); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Perform rectangle copy (blit) operation from one bitmap to another, @@ -3128,7 +3138,7 @@ VOID GFX__Hidd_Gfx__CopyBox(OOP_Class *cl, OOP_Object *obj, struct pHidd_Gfx_Cop #define NUMPIX 100000 #endif -IPTR GFX__Hidd_Gfx__CopyBoxMasked(OOP_Class *cl, OOP_Object *obj, struct pHidd_Gfx_CopyBoxMasked *msg) +IPTR GFXHIDD__Hidd_Gfx__CopyBoxMasked(OOP_Class *cl, OOP_Object *obj, struct pHidd_Gfx_CopyBoxMasked *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; ULONG pixfmt = vHidd_StdPixFmt_Native32; @@ -3342,7 +3352,7 @@ IPTR GFX__Hidd_Gfx__CopyBoxMasked(OOP_Class *cl, OOP_Object *obj, struct pHidd_G VOID OOP_DoMethod(OOP_Object *obj, OOP_Msg msg); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Indicate upcoming machine reset. Obsolete. @@ -3368,7 +3378,7 @@ IPTR GFX__Hidd_Gfx__CopyBoxMasked(OOP_Class *cl, OOP_Object *obj, struct pHidd_G *****************************************************************************************/ -VOID GFX__Hidd_Gfx__ShowImminentReset(OOP_Class *cl, OOP_Object *obj, OOP_Msg msg) +VOID GFXHIDD__Hidd_Gfx__ShowImminentReset(OOP_Class *cl, OOP_Object *obj, OOP_Msg msg) { } @@ -3379,7 +3389,7 @@ VOID GFX__Hidd_Gfx__ShowImminentReset(OOP_Class *cl, OOP_Object *obj, OOP_Msg ms * They operate only on static data and don't need object pointer. */ -OOP_Object *GFX__Hidd_Gfx__RegisterPixFmt(OOP_Class *cl, struct TagItem *pixFmtTags) +OOP_Object *GFXHIDD__Hidd_Gfx__RegisterPixFmt(OOP_Class *cl, struct TagItem *pixFmtTags) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; HIDDT_PixelFormat cmp_pf; @@ -3485,7 +3495,7 @@ OOP_Object *GFX__Hidd_Gfx__RegisterPixFmt(OOP_Class *cl, struct TagItem *pixFmtT /* This method doesn't need object pointer, it's static. */ -VOID GFX__Hidd_Gfx__ReleasePixFmt(OOP_Class *cl, OOP_Object *pf) +VOID GFXHIDD__Hidd_Gfx__ReleasePixFmt(OOP_Class *cl, OOP_Object *pf) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; struct class_static_data *data; @@ -3522,7 +3532,7 @@ VOID GFX__Hidd_Gfx__ReleasePixFmt(OOP_Class *cl, OOP_Object *pf) OOP_Object *sync, OOP_Object *pixFmt); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Check if given display mode is supported by the driver. @@ -3564,7 +3574,7 @@ VOID GFX__Hidd_Gfx__ReleasePixFmt(OOP_Class *cl, OOP_Object *pf) *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__CheckMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CheckMode *msg) +BOOL GFXHIDD__Hidd_Gfx__CheckMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CheckMode *msg) { /* As a default we allways return TRUE, ie. the mode is OK */ return TRUE; @@ -3581,7 +3591,7 @@ BOOL GFX__Hidd_Gfx__CheckMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Che OOP_Object *HIDD_Gfx_GetPixFmt(OOP_Object *gfxHidd, HIDDT_StdPixFmt pixFmt); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Get a standard pixelformat descriptor from internal pixelformats database. @@ -3610,7 +3620,7 @@ BOOL GFX__Hidd_Gfx__CheckMode(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Che *****************************************************************************************/ -OOP_Object *GFX__Hidd_Gfx__GetPixFmt(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetPixFmt *msg) +OOP_Object *GFXHIDD__Hidd_Gfx__GetPixFmt(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetPixFmt *msg) { OOP_Object *fmt; @@ -3638,7 +3648,7 @@ OOP_Object *GFX__Hidd_Gfx__GetPixFmt(OOP_Class *cl, OOP_Object *o, struct pHidd_ OOP_Object *HIDD_Gfx_GetSync(OOP_Object *gfxHidd, ULONG num); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Get a sync object from internal display mode database by index @@ -3662,9 +3672,9 @@ OOP_Object *GFX__Hidd_Gfx__GetPixFmt(OOP_Class *cl, OOP_Object *o, struct pHidd_ *****************************************************************************************/ -OOP_Object *GFX__Hidd_Gfx__GetSync(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetSync *msg) +OOP_Object *GFXHIDD__Hidd_Gfx__GetSync(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetSync *msg) { - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); if (msg->num < data->mdb.num_syncs) return data->mdb.syncs[msg->num]; @@ -3686,7 +3696,7 @@ OOP_Object *GFX__Hidd_Gfx__GetSync(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf struct HIDD_ModeProperties *props, ULONG propsLen); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Obtain an information about the video mode. @@ -3722,7 +3732,7 @@ OOP_Object *GFX__Hidd_Gfx__GetSync(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf *****************************************************************************************/ -ULONG GFX__Hidd_Gfx__ModeProperties(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ModeProperties *msg) +ULONG GFXHIDD__Hidd_Gfx__ModeProperties(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ModeProperties *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; struct HIDD_ModeProperties props = {0, 0, 0}; @@ -3756,7 +3766,7 @@ ULONG GFX__Hidd_Gfx__ModeProperties(OOP_Class *cl, OOP_Object *o, struct pHidd_G BOOL HIDD_Gfx_GetGamma(OOP_Object *gfxHidd, UBYTE *Red, UBYTE *Green, UBYTE *Blue); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Get current gamma table for the display. @@ -3781,7 +3791,7 @@ ULONG GFX__Hidd_Gfx__ModeProperties(OOP_Class *cl, OOP_Object *o, struct pHidd_G *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__GetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamma *msg) +BOOL GFXHIDD__Hidd_Gfx__GetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamma *msg) { return FALSE; } @@ -3797,7 +3807,7 @@ BOOL GFX__Hidd_Gfx__GetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamm BOOL HIDD_Gfx_SetGamma(OOP_Object *gfxHidd, UBYTE *Red, UBYTE *Green, UBYTE *Blue); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Set current gamma table for the display. @@ -3826,7 +3836,7 @@ BOOL GFX__Hidd_Gfx__GetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamm *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__SetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamma *msg) +BOOL GFXHIDD__Hidd_Gfx__SetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamma *msg) { return FALSE; } @@ -3842,7 +3852,7 @@ BOOL GFX__Hidd_Gfx__SetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamm BOOL HIDD_Gfx_QueryHardware3D(OOP_Object *gfxHidd, OOP_Object *pixFmt); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Query if the driver supports hardware-accelerated 3D graphics for the given @@ -3868,7 +3878,7 @@ BOOL GFX__Hidd_Gfx__SetGamma(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Gamm *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__QueryHardware3D(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_QueryHardware3D *msg) +BOOL GFXHIDD__Hidd_Gfx__QueryHardware3D(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_QueryHardware3D *msg) { return FALSE; } @@ -3884,7 +3894,7 @@ BOOL GFX__Hidd_Gfx__QueryHardware3D(OOP_Class *cl, OOP_Object *o, struct pHidd_G BOOL HIDD_Gfx_GetMaxSpriteSize(OOP_Object *gfxHidd, ULONG Type, UWORD *Width, UWORD *Height); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Query maximum allowed size for the given sprite type. @@ -3916,7 +3926,7 @@ BOOL GFX__Hidd_Gfx__QueryHardware3D(OOP_Class *cl, OOP_Object *o, struct pHidd_G *****************************************************************************************/ -BOOL GFX__Hidd_Gfx__GetMaxSpriteSize(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetMaxSpriteSize *msg) +BOOL GFXHIDD__Hidd_Gfx__GetMaxSpriteSize(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_GetMaxSpriteSize *msg) { IPTR types; struct Library *OOPBase = CSD(cl)->cs_OOPBase; @@ -3942,7 +3952,7 @@ BOOL GFX__Hidd_Gfx__GetMaxSpriteSize(OOP_Class *cl, OOP_Object *o, struct pHidd_ OOP_Object *HIDD_Gfx_NewOverlay(OOP_Object *gfxHidd, struct TagItem *tagList); LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Create a video overlay object. @@ -3972,7 +3982,7 @@ BOOL GFX__Hidd_Gfx__GetMaxSpriteSize(OOP_Class *cl, OOP_Object *o, struct pHidd_ *****************************************************************************************/ -OOP_Object *GFX__Hidd_Gfx__NewOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_NewOverlay *msg) +OOP_Object *GFXHIDD__Hidd_Gfx__NewOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_NewOverlay *msg) { struct Library *UtilityBase = CSD(cl)->cs_UtilityBase; ULONG *err = (ULONG *)GetTagData(aHidd_Overlay_Error, 0, msg->attrList); @@ -3994,7 +4004,7 @@ OOP_Object *GFX__Hidd_Gfx__NewOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd VOID HIDD_Gfx_DisposeOverlay(OOP_Object *gfxHidd, OOP_Object *Overlay) LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Deletes an overlay previously created by moHidd_Gfx_NewOverlay. @@ -4024,7 +4034,7 @@ OOP_Object *GFX__Hidd_Gfx__NewOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd *****************************************************************************************/ -VOID GFX__Hidd_Gfx__DisposeOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_DisposeOverlay *msg) +VOID GFXHIDD__Hidd_Gfx__DisposeOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_DisposeOverlay *msg) { struct Library *OOPBase = CSD(cl)->cs_OOPBase; OOP_DisposeObject(msg->Overlay); @@ -4041,7 +4051,7 @@ VOID GFX__Hidd_Gfx__DisposeOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf ULONG HIDD_Gfx_MakeViewPort(OOP_Object *gfxHidd, struct HIDD_ViewPortData *data) LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Performs driver-specific setup on a given ViewPort. @@ -4074,7 +4084,7 @@ VOID GFX__Hidd_Gfx__DisposeOverlay(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf *****************************************************************************************/ -ULONG GFX__Hidd_Gfx__MakeViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_MakeViewPort *msg) +ULONG GFXHIDD__Hidd_Gfx__MakeViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_MakeViewPort *msg) { D(bug("Gfx::MakeViewPort: object 0x%p, data 0x%p\n", o, msg->Data)); @@ -4092,7 +4102,7 @@ ULONG GFX__Hidd_Gfx__MakeViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx ULONG HIDD_Gfx_CleanViewPort(OOP_Object *gfxHidd, struct HIDD_ViewPortData *data) LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Performs driver-specific cleanup on a given ViewPort. @@ -4123,7 +4133,7 @@ ULONG GFX__Hidd_Gfx__MakeViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx *****************************************************************************************/ -void GFX__Hidd_Gfx__CleanViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CleanViewPort *msg) +void GFXHIDD__Hidd_Gfx__CleanViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CleanViewPort *msg) { D(bug("Gfx::CleanViewPort: object 0x%p, data 0x%p\n", o, msg->Data)); } @@ -4139,7 +4149,7 @@ void GFX__Hidd_Gfx__CleanViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx ULONG HIDD_Gfx_PrepareViewPorts(OOP_Object *gfxHidd, struct HIDD_ViewPortData *data, struct View *view) LOCATION - hidd.graphics.graphics + hidd.gfx.driver FUNCTION Performs driver-specific setup on a given view. @@ -4173,7 +4183,7 @@ void GFX__Hidd_Gfx__CleanViewPort(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx *****************************************************************************************/ -ULONG GFX__Hidd_Gfx__PrepareViewPorts(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ShowViewPorts *msg) +ULONG GFXHIDD__Hidd_Gfx__PrepareViewPorts(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_ShowViewPorts *msg) { return MCOP_OK; } @@ -4181,10 +4191,10 @@ ULONG GFX__Hidd_Gfx__PrepareViewPorts(OOP_Class *cl, OOP_Object *o, struct pHidd /****************************************************************************************/ /* This is a private nonvirtual method */ -void GFX__Hidd_Gfx__UpdateBitMap(OOP_Class *cl, OOP_Object *o, OOP_Object *bm, +void GFXHIDD__Hidd_Gfx__UpdateBitMap(OOP_Class *cl, OOP_Object *o, OOP_Object *bm, struct pHidd_BitMap_UpdateRect *msg, struct Rectangle *display) { - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); /* * We check data->shownbm twice in order to avoid unnecessary locking @@ -4232,160 +4242,9 @@ void GFX__Hidd_Gfx__UpdateBitMap(OOP_Class *cl, OOP_Object *o, OOP_Object *bm, } } -#undef csd - -/****************************************************************************************/ - -static ULONG ObtainAttrBases(OOP_AttrBase *bases, CONST_STRPTR const *interfaces, ULONG count, struct Library *OOPBase) -{ - ULONG i; - ULONG failed = 0; - - for (i = 0; i < count; i++) - { - bases[i] = OOP_ObtainAttrBase(interfaces[i]); - if (!bases[i]) - failed++; - } - - return failed; -} - -static void ReleaseAttrBases(OOP_AttrBase *bases, CONST_STRPTR const *interfaces, ULONG count, struct Library *OOPBase) -{ - ULONG i; - - for (i = 0; i < count; i++) - { - if (bases[i]) - OOP_ReleaseAttrBase(interfaces[i]); - } -} - -static ULONG GetMethodBases(OOP_MethodID *bases, CONST_STRPTR const *interfaces, ULONG count, struct Library *OOPBase) -{ - ULONG i; - ULONG failed = 0; - - for (i = 0; i < count; i++) - { - bases[i] = OOP_GetMethodID(interfaces[i], 0); - if (bases[i] == -1) - failed++; - } - - return failed; -} - -static const CONST_STRPTR interfaces[NUM_ATTRBASES] = -{ - IID_Hidd_BitMap, - IID_Hidd_Gfx, - IID_Hidd_GC, - IID_Hidd_ColorMap, - IID_Hidd_Overlay, - IID_Hidd_Sync, - IID_Hidd_PixFmt, - IID_Hidd_PlanarBM, - IID_Hidd_ChunkyBM, -}; - -static int GFX_ClassInit(LIBBASETYPEPTR LIBBASE) -{ - struct class_static_data *csd = &LIBBASE->hdg_csd; - struct Library *OOPBase = csd->cs_OOPBase; - - if (!(csd->cs_UtilityBase = TaggedOpenLibrary(TAGGEDOPEN_UTILITY))) - { - ReturnInt("init_gfxhiddclass", ULONG, FALSE); - } - - if (ObtainAttrBases(csd->attrBases, interfaces, NUM_ATTRBASES, OOPBase)) - { - ReturnInt("init_gfxhiddclass", ULONG, FALSE); - } - - if (GetMethodBases(csd->methodBases, interfaces, NUM_METHODBASES, OOPBase)) - { - ReturnInt("init_gfxhiddclass", ULONG, FALSE); - } - - D(bug("Creating std pixelfmts\n")); - ReturnInt("init_gfxhiddclass", ULONG, create_std_pixfmts(csd)); -} - -/****************************************************************************************/ - -static int GFX_ClassFree(LIBBASETYPEPTR LIBBASE) -{ - struct class_static_data *csd = &LIBBASE->hdg_csd; - struct Library *OOPBase = csd->cs_OOPBase; - - EnterFunc(bug("free_gfxhiddclass(csd=%p)\n", csd)); - - delete_pixfmts(csd); - ReleaseAttrBases(csd->attrBases, interfaces, NUM_ATTRBASES, OOPBase); - CloseLibrary(csd->cs_UtilityBase); - - ReturnInt("free_gfxhiddclass", BOOL, TRUE); -} - -/****************************************************************************************/ - -ADD2INITLIB(GFX_ClassInit, 0) -ADD2EXPUNGELIB(GFX_ClassFree, 0) - -/****************************************************************************************/ - -/* Since the shift/mask values of a pixel format are designed for pixel - access, not byte access, they are endianess dependant */ - -#if AROS_BIG_ENDIAN -#include "stdpixfmts_be.h" -#else -#include "stdpixfmts_le.h" -#endif - -/****************************************************************************************/ - -static BOOL create_std_pixfmts(struct class_static_data *csd) -{ - ULONG i; - struct pixfmt_data *pf; - - memset(csd->std_pixfmts, 0, sizeof (OOP_Object *) * num_Hidd_StdPixFmt); - - for (i = 0; i < num_Hidd_StdPixFmt; i ++) - { - pf = (struct pixfmt_data *)create_and_init_object(csd->pixfmtclass, (UBYTE *)&stdpfs[i], sizeof (stdpfs[i]), csd); - - if (!pf) - { - D(bug("FAILED TO CREATE PIXEL FORMAT %d\n", i)); - delete_pixfmts(csd); - ReturnBool("create_stdpixfmts", FALSE); - } - - csd->std_pixfmts[i] = &pf->pf; - /* We don't use semaphore protection here because we do this only during class init stage */ - pf->refcount = 1; - AddTail((struct List *)&csd->pflist, (struct Node *)&pf->node); - } - ReturnBool("create_stdpixfmts", TRUE); -} - /****************************************************************************************/ -static VOID delete_pixfmts(struct class_static_data *csd) -{ - struct Node *n, *safe; - struct Library *OOPBase = csd->cs_OOPBase; - - ForeachNodeSafe(&csd->pflist, n, safe) - OOP_DisposeObject((OOP_Object *)PIXFMT_OBJ(n)); -} - -/****************************************************************************************/ +#undef csd static inline BOOL cmp_pfs(HIDDT_PixelFormat *tmppf, HIDDT_PixelFormat *dbpf) { @@ -4397,140 +4256,6 @@ static inline BOOL cmp_pfs(HIDDT_PixelFormat *tmppf, HIDDT_PixelFormat *dbpf) return !memcmp(tmppf, dbpf, offsetof(HIDDT_PixelFormat, stdpixfmt)); } -/****************************************************************************************/ - -/* - Parses the tags supplied in 'tags' and puts the result into 'pf'. - It also checks to see if all needed attrs are supplied. - It uses 'attrcheck' for this, so you may find attrs outside - of this function, and mark them as found before calling this function -*/ - -#define PFAF(x) (1L << aoHidd_PixFmt_ ## x) -#define PF_COMMON_AF ( PFAF(Depth) | PFAF(BitsPerPixel) | PFAF(BytesPerPixel) \ - | PFAF(ColorModel) | PFAF(BitMapType) ) - -#define PF_TRUECOLOR_AF ( PFAF(RedMask) | PFAF(GreenMask) | PFAF(BlueMask) | PFAF(AlphaMask) | \ - PFAF(RedShift) | PFAF(GreenShift) | PFAF(BlueShift) | PFAF(AlphaShift)) - -#define PF_PALETTE_AF ( PFAF(CLUTMask) | PFAF(CLUTShift) | PFAF(RedMask) | PFAF(GreenMask) | \ - PFAF(BlueMask) ) - -#define PFAO(x) (aoHidd_PixFmt_ ## x) - -/****************************************************************************************/ - -BOOL parse_pixfmt_tags(struct TagItem *tags, HIDDT_PixelFormat *pf, - ULONG ATTRCHECK(pixfmt), struct class_static_data *csd) -{ - IPTR attrs[num_Hidd_PixFmt_Attrs] = {0}; - struct Library *OOPBase = csd->cs_OOPBase; - - if (0 != OOP_ParseAttrs(tags, attrs, num_Hidd_PixFmt_Attrs, - &ATTRCHECK(pixfmt), HiddPixFmtAttrBase)) - { - D(bug("!!! parse_pixfmt_tags: ERROR PARSING TAGS THROUGH OOP_ParseAttrs !!!\n")); - return FALSE; - } - - if (PF_COMMON_AF != (PF_COMMON_AF & ATTRCHECK(pixfmt))) - { - D(bug("!!! parse_pixfmt_tags: Missing PixFmt attributes passed to parse_pixfmt_tags(): %x !!!\n", ATTRCHECK(pixfmt))); - return FALSE; - } - - /* Set the common attributes */ - pf->depth = attrs[PFAO(Depth)]; - pf->size = attrs[PFAO(BitsPerPixel)]; - pf->bytes_per_pixel = attrs[PFAO(BytesPerPixel)]; - /* Fill in only real StdPixFmt specification. Special values (Native and Native32) - are not allowed here */ - if (attrs[PFAO(StdPixFmt)] >= num_Hidd_PseudoStdPixFmt) - pf->stdpixfmt = attrs[PFAO(StdPixFmt)]; - - SET_PF_COLMODEL( pf, attrs[PFAO(ColorModel)]); - SET_PF_BITMAPTYPE(pf, attrs[PFAO(BitMapType)]); - - if (ATTRCHECK(pixfmt) & PFAF(SwapPixelBytes)) - { - SET_PF_SWAPPIXELBYTES_FLAG(pf, attrs[PFAO(SwapPixelBytes)]); - } - - /* Set the colormodel specific stuff */ - switch (HIDD_PF_COLMODEL(pf)) - { - case vHidd_ColorModel_TrueColor: - /* Check that we got all the truecolor describing stuff */ - if (PF_TRUECOLOR_AF != (PF_TRUECOLOR_AF & ATTRCHECK(pixfmt))) - { - D(bug("!!! Unsufficient true color format describing attrs to pixfmt in parse_pixfmt_tags() !!!\n")); - return FALSE; - } - - /* Set the truecolor stuff */ - pf->red_mask = attrs[PFAO(RedMask)]; - pf->green_mask = attrs[PFAO(GreenMask)]; - pf->blue_mask = attrs[PFAO(BlueMask)]; - pf->alpha_mask = attrs[PFAO(AlphaMask)]; - - pf->red_shift = attrs[PFAO(RedShift)]; - pf->green_shift = attrs[PFAO(GreenShift)]; - pf->blue_shift = attrs[PFAO(BlueShift)]; - pf->alpha_shift = attrs[PFAO(AlphaShift)]; - break; - - case vHidd_ColorModel_Palette: - case vHidd_ColorModel_StaticPalette: - if ( PF_PALETTE_AF != (PF_PALETTE_AF & ATTRCHECK(pixfmt))) - { - D(bug("!!! Unsufficient palette format describing attrs to pixfmt in parse_pixfmt_tags() !!!\n")); - return FALSE; - } - - /* set palette stuff */ - pf->clut_mask = attrs[PFAO(CLUTMask)]; - pf->clut_shift = attrs[PFAO(CLUTShift)]; - - pf->red_mask = attrs[PFAO(RedMask)]; - pf->green_mask = attrs[PFAO(GreenMask)]; - pf->blue_mask = attrs[PFAO(BlueMask)]; - - break; - - } /* shift (colormodel) */ - - return TRUE; -} - -/****************************************************************************************/ - -/* - Create an empty object and initialize it the "ugly" way. This only works with - CLID_Hidd_PixFmt and CLID_Hidd_Sync classes -*/ - -/****************************************************************************************/ - -static OOP_Object *create_and_init_object(OOP_Class *cl, UBYTE *data, ULONG datasize, - struct class_static_data *csd) -{ - OOP_Object *o; - struct Library *OOPBase = csd->cs_OOPBase; - - o = OOP_NewObject(cl, NULL, NULL); - if (NULL == o) - { - D(bug("!!! UNABLE TO CREATE OBJECT IN create_and_init_object() !!!\n")); - return NULL; - } - - memcpy(o, data, datasize); - - return o; -} - -/****************************************************************************************/ - static struct pixfmt_data *find_pixfmt(HIDDT_PixelFormat *tofind, struct class_static_data *csd) { struct pixfmt_data *retpf = NULL; diff --git a/rom/hidds/graphics/gfx_hwclass.c b/rom/hidds/graphics/gfx_hwclass.c new file mode 100644 index 0000000000..e2e707b289 --- /dev/null +++ b/rom/hidds/graphics/gfx_hwclass.c @@ -0,0 +1,42 @@ +/* + Copyright (C) 2017, The AROS Development Team. All rights reserved. + $Id$ +*/ + +#include "gfx_debug.h" + +#include +#include + +#include "gfx_intern.h" + +OOP_Object *GFXHW__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +{ + bug("[HWGfx] csd @ 0x%p\n", CSD(cl)); + + if (!CSD(cl)->gfxhwinstance) + { + struct TagItem new_tags[] = + { + {aHW_ClassName, (IPTR)"Display Hardware"}, + {TAG_DONE , 0 } + }; + struct pRoot_New new_msg = + { + .mID = msg->mID, + .attrList = new_tags + }; + + bug("[HWGfx] Instantiating...\n"); + CSD(cl)->gfxhwinstance = (OOP_Object *)OOP_DoSuperMethod(cl, o, &new_msg.mID); + } + + bug("[HWGfx] returning 0x%p\n", CSD(cl)->gfxhwinstance); + + return CSD(cl)->gfxhwinstance; +} + +VOID GFXHW__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) +{ + /* We are singletone. Cannot dispose. */ +} diff --git a/rom/hidds/graphics/gfx_init.c b/rom/hidds/graphics/gfx_init.c new file mode 100644 index 0000000000..b0ba6bebfe --- /dev/null +++ b/rom/hidds/graphics/gfx_init.c @@ -0,0 +1,340 @@ +/* + Copyright © 1995-2017, The AROS Development Team. All rights reserved. + $Id$ + + Desc: Graphics hidd initialization code. + Lang: English. +*/ + +#include "gfx_debug.h" + +#define __OOP_NOMETHODBASES__ + +#include +#include + +#include + +#include + +#include "gfx_intern.h" + +#include LC_LIBDEFS_FILE + +#undef csd + +/****************************************************************************************/ + +/* Since the shift/mask values of a pixel format are designed for pixel + access, not byte access, they are endianess dependant */ + +#if AROS_BIG_ENDIAN +#include "stdpixfmts_be.h" +#else +#include "stdpixfmts_le.h" +#endif + +/****************************************************************************************/ + +/* + Parses the tags supplied in 'tags' and puts the result into 'pf'. + It also checks to see if all needed attrs are supplied. + It uses 'attrcheck' for this, so you may find attrs outside + of this function, and mark them as found before calling this function +*/ + +#define PFAF(x) (1L << aoHidd_PixFmt_ ## x) +#define PF_COMMON_AF ( PFAF(Depth) | PFAF(BitsPerPixel) | PFAF(BytesPerPixel) \ + | PFAF(ColorModel) | PFAF(BitMapType) ) + +#define PF_TRUECOLOR_AF ( PFAF(RedMask) | PFAF(GreenMask) | PFAF(BlueMask) | PFAF(AlphaMask) | \ + PFAF(RedShift) | PFAF(GreenShift) | PFAF(BlueShift) | PFAF(AlphaShift)) + +#define PF_PALETTE_AF ( PFAF(CLUTMask) | PFAF(CLUTShift) | PFAF(RedMask) | PFAF(GreenMask) | \ + PFAF(BlueMask) ) + +#define PFAO(x) (aoHidd_PixFmt_ ## x) + +/****************************************************************************************/ + +BOOL parse_pixfmt_tags(struct TagItem *tags, HIDDT_PixelFormat *pf, + ULONG ATTRCHECK(pixfmt), struct class_static_data *csd) +{ + IPTR attrs[num_Hidd_PixFmt_Attrs] = {0}; + struct Library *OOPBase = csd->cs_OOPBase; + + if (0 != OOP_ParseAttrs(tags, attrs, num_Hidd_PixFmt_Attrs, + &ATTRCHECK(pixfmt), HiddPixFmtAttrBase)) + { + D(bug("!!! parse_pixfmt_tags: ERROR PARSING TAGS THROUGH OOP_ParseAttrs !!!\n")); + return FALSE; + } + + if (PF_COMMON_AF != (PF_COMMON_AF & ATTRCHECK(pixfmt))) + { + D(bug("!!! parse_pixfmt_tags: Missing PixFmt attributes passed to parse_pixfmt_tags(): %x !!!\n", ATTRCHECK(pixfmt))); + return FALSE; + } + + /* Set the common attributes */ + pf->depth = attrs[PFAO(Depth)]; + pf->size = attrs[PFAO(BitsPerPixel)]; + pf->bytes_per_pixel = attrs[PFAO(BytesPerPixel)]; + /* Fill in only real StdPixFmt specification. Special values (Native and Native32) + are not allowed here */ + if (attrs[PFAO(StdPixFmt)] >= num_Hidd_PseudoStdPixFmt) + pf->stdpixfmt = attrs[PFAO(StdPixFmt)]; + + SET_PF_COLMODEL( pf, attrs[PFAO(ColorModel)]); + SET_PF_BITMAPTYPE(pf, attrs[PFAO(BitMapType)]); + + if (ATTRCHECK(pixfmt) & PFAF(SwapPixelBytes)) + { + SET_PF_SWAPPIXELBYTES_FLAG(pf, attrs[PFAO(SwapPixelBytes)]); + } + + /* Set the colormodel specific stuff */ + switch (HIDD_PF_COLMODEL(pf)) + { + case vHidd_ColorModel_TrueColor: + /* Check that we got all the truecolor describing stuff */ + if (PF_TRUECOLOR_AF != (PF_TRUECOLOR_AF & ATTRCHECK(pixfmt))) + { + D(bug("!!! Unsufficient true color format describing attrs to pixfmt in parse_pixfmt_tags() !!!\n")); + return FALSE; + } + + /* Set the truecolor stuff */ + pf->red_mask = attrs[PFAO(RedMask)]; + pf->green_mask = attrs[PFAO(GreenMask)]; + pf->blue_mask = attrs[PFAO(BlueMask)]; + pf->alpha_mask = attrs[PFAO(AlphaMask)]; + + pf->red_shift = attrs[PFAO(RedShift)]; + pf->green_shift = attrs[PFAO(GreenShift)]; + pf->blue_shift = attrs[PFAO(BlueShift)]; + pf->alpha_shift = attrs[PFAO(AlphaShift)]; + break; + + case vHidd_ColorModel_Palette: + case vHidd_ColorModel_StaticPalette: + if ( PF_PALETTE_AF != (PF_PALETTE_AF & ATTRCHECK(pixfmt))) + { + D(bug("!!! Unsufficient palette format describing attrs to pixfmt in parse_pixfmt_tags() !!!\n")); + return FALSE; + } + + /* set palette stuff */ + pf->clut_mask = attrs[PFAO(CLUTMask)]; + pf->clut_shift = attrs[PFAO(CLUTShift)]; + + pf->red_mask = attrs[PFAO(RedMask)]; + pf->green_mask = attrs[PFAO(GreenMask)]; + pf->blue_mask = attrs[PFAO(BlueMask)]; + + break; + + } /* shift (colormodel) */ + + return TRUE; +} + +/****************************************************************************************/ + +/* + Create an empty object and initialize it the "ugly" way. This only works with + CLID_Hidd_PixFmt and CLID_Hidd_Sync classes +*/ + +/****************************************************************************************/ + +static OOP_Object *create_and_init_object(OOP_Class *cl, UBYTE *data, ULONG datasize, + struct class_static_data *csd) +{ + OOP_Object *o; + struct Library *OOPBase = csd->cs_OOPBase; + + o = OOP_NewObject(cl, NULL, NULL); + if (NULL == o) + { + D(bug("!!! UNABLE TO CREATE OBJECT IN create_and_init_object() !!!\n")); + return NULL; + } + + memcpy(o, data, datasize); + + return o; +} + +/****************************************************************************************/ + +static VOID delete_pixfmts(struct class_static_data *csd) +{ + struct Node *n, *safe; + struct Library *OOPBase = csd->cs_OOPBase; + + ForeachNodeSafe(&csd->pflist, n, safe) + OOP_DisposeObject((OOP_Object *)PIXFMT_OBJ(n)); +} + +/****************************************************************************************/ + +static BOOL create_std_pixfmts(struct class_static_data *csd) +{ + ULONG i; + struct pixfmt_data *pf; + + memset(csd->std_pixfmts, 0, sizeof (OOP_Object *) * num_Hidd_StdPixFmt); + + for (i = 0; i < num_Hidd_StdPixFmt; i ++) + { + pf = (struct pixfmt_data *)create_and_init_object(csd->pixfmtclass, (UBYTE *)&stdpfs[i], sizeof (stdpfs[i]), csd); + + if (!pf) + { + D(bug("FAILED TO CREATE PIXEL FORMAT %d\n", i)); + delete_pixfmts(csd); + ReturnBool("create_stdpixfmts", FALSE); + } + + csd->std_pixfmts[i] = &pf->pf; + /* We don't use semaphore protection here because we do this only during class init stage */ + pf->refcount = 1; + AddTail((struct List *)&csd->pflist, (struct Node *)&pf->node); + } + ReturnBool("create_stdpixfmts", TRUE); +} + +/****************************************************************************************/ + +static const CONST_STRPTR interfaces[NUM_ATTRBASES] = +{ + IID_Hidd_BitMap, + IID_Hidd_Gfx, + IID_Hidd_GC, + IID_Hidd_ColorMap, + IID_HW, + IID_Hidd, + IID_Hidd_Overlay, + IID_Hidd_Sync, + IID_Hidd_PixFmt, + IID_Hidd_PlanarBM, + IID_Hidd_ChunkyBM +}; + +static ULONG ObtainAttrBases(OOP_AttrBase *bases, CONST_STRPTR const *interfaces, ULONG count, struct Library *OOPBase) +{ + ULONG i; + ULONG failed = 0; + + for (i = 0; i < count; i++) + { + bases[i] = OOP_ObtainAttrBase(interfaces[i]); + if (!bases[i]) + failed++; + } + + return failed; +} + +static void ReleaseAttrBases(OOP_AttrBase *bases, CONST_STRPTR const *interfaces, ULONG count, struct Library *OOPBase) +{ + ULONG i; + + for (i = 0; i < count; i++) + { + if (bases[i]) + OOP_ReleaseAttrBase(interfaces[i]); + } +} + +static ULONG GetMethodBases(OOP_MethodID *bases, CONST_STRPTR const *interfaces, ULONG count, struct Library *OOPBase) +{ + ULONG i; + ULONG failed = 0; + + for (i = 0; i < count; i++) + { + bases[i] = OOP_GetMethodID(interfaces[i], 0); + if (bases[i] == -1) + failed++; + } + + return failed; +} + +static int GFX_ClassInit(LIBBASETYPEPTR LIBBASE) +{ + struct class_static_data *csd = &LIBBASE->hdg_csd; + struct Library *OOPBase = csd->cs_OOPBase; + OOP_Object *hwroot; + + D(bug("[HiddGfx] %s(0x%p)\n", __func__, LIBBASE)); + + D(bug("[HiddGfx] %s: csd @ 0x%p\n", __func__, csd)); + + D(bug("[HiddGfx] %s: GC class @ 0x%p\n", __func__, csd->gcclass)); + D(bug("[HiddGfx] %s: BitMap class @ 0x%p\n", __func__, csd->bitmapclass)); + + csd->cs_GfxBase = NULL; + NEWLIST(&csd->pflist); + + if (!(csd->cs_UtilityBase = TaggedOpenLibrary(TAGGEDOPEN_UTILITY))) + { + D(bug("[HiddGfx] %s: failed to open utility.library\n", __func__)); + ReturnInt("init_gfxhiddclass", ULONG, FALSE); + } + + if (ObtainAttrBases(csd->attrBases, interfaces, NUM_ATTRBASES, OOPBase)) + { + D(bug("[HiddGfx] %s: Failed to obtain class Attribute Bases\n", __func__)); + ReturnInt("init_gfxhiddclass", ULONG, FALSE); + } + + if (GetMethodBases(csd->methodBases, interfaces, NUM_METHODBASES, OOPBase)) + { + D(bug("[HiddGfx] %s: Failed to obtain class Method Bases\n", __func__)); + ReturnInt("init_gfxhiddclass", ULONG, FALSE); + } + + InitSemaphore(&csd->sema); + InitSemaphore(&csd->pfsema); + InitSemaphore(&csd->rgbconvertfuncs_sem); + + D(bug("[HiddGfx] %s: Creating std pixelfmts\n", __func__)); + create_std_pixfmts(csd); + + D(bug("[HiddGfx] %s: Prepairing Gfx HW Root\n", __func__)); + hwroot = OOP_NewObject(NULL, CLID_HW_Root, NULL); + if ((hwroot) && (HW_AddDriver(hwroot, csd->gfxhwclass, NULL))) + { + D( + bug("[HiddGfx] %s: Initialization complete\n", __func__); + bug("[HiddGfx] %s: Gfx HW Root @ 0x%p\n", __func__, csd->gfxhwinstance); + ) + return TRUE; + } + + ReturnInt("init_gfxhiddclass", BOOL, FALSE); +} + +/****************************************************************************************/ + +static int GFX_ClassFree(LIBBASETYPEPTR LIBBASE) +{ + struct class_static_data *csd = &LIBBASE->hdg_csd; + struct Library *OOPBase = csd->cs_OOPBase; + + EnterFunc(bug("free_gfxhiddclass(csd=%p)\n", csd)); + + delete_pixfmts(csd); + ReleaseAttrBases(csd->attrBases, interfaces, NUM_ATTRBASES, OOPBase); + CloseLibrary(csd->cs_UtilityBase); + + ReturnInt("free_gfxhiddclass", BOOL, TRUE); +} + +/****************************************************************************************/ + +ADD2INITLIB(GFX_ClassInit, -2) +ADD2EXPUNGELIB(GFX_ClassFree, -2) diff --git a/rom/hidds/graphics/graphics_intern.h b/rom/hidds/graphics/gfx_intern.h similarity index 89% rename from rom/hidds/graphics/graphics_intern.h rename to rom/hidds/graphics/gfx_intern.h index 9b161e764c..12320e6466 100644 --- a/rom/hidds/graphics/graphics_intern.h +++ b/rom/hidds/graphics/gfx_intern.h @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -24,6 +24,10 @@ #define USE_FAST_GETPIXEL 1 #define COPYBOX_CHECK_FOR_ALIKE_PIXFMT 1 +struct HWGfxData +{ +}; + #define HBM(x) ((struct HIDDBitMapData *)x) #define GOT_PF_ATTR(code) GOT_ATTR(code, aoHidd_PixFmt, pixfmt) @@ -132,7 +136,7 @@ struct mode_db { }; -struct HIDDGraphicsData +struct HiddGfxData { /* Gfx mode "database" */ struct mode_db mdb; @@ -148,19 +152,19 @@ struct HIDDGraphicsData }; /* Private gfxhidd methods */ -OOP_Object *GFX__Hidd_Gfx__RegisterPixFmt(OOP_Class *cl, struct TagItem *pixFmtTags); -VOID GFX__Hidd_Gfx__ReleasePixFmt(OOP_Class *cl, OOP_Object *pf); +OOP_Object *GFXHIDD__Hidd_Gfx__RegisterPixFmt(OOP_Class *cl, struct TagItem *pixFmtTags); +VOID GFXHIDD__Hidd_Gfx__ReleasePixFmt(OOP_Class *cl, OOP_Object *pf); -static inline BOOL GFX__Hidd_Gfx__SetFBColors(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetColors *msg) +static inline BOOL GFXHIDD__Hidd_Gfx__SetFBColors(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetColors *msg) { - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); return OOP_DoMethod(data->framebuffer, &msg->mID); } -static inline UBYTE GFX__Hidd_Gfx__GetFBModeQuick(OOP_Class *cl, OOP_Object *o) +static inline UBYTE GFXHIDD__Hidd_Gfx__GetFBModeQuick(OOP_Class *cl, OOP_Object *o) { - struct HIDDGraphicsData *data = OOP_INST_DATA(cl, o); + struct HiddGfxData *data = OOP_INST_DATA(cl, o); return data->fbmode; } @@ -169,9 +173,9 @@ static inline UBYTE GFX__Hidd_Gfx__GetFBModeQuick(OOP_Class *cl, OOP_Object *o) * macro won't expand the HiddGfxBase macro to the csd * structure. */ -#define GFX__Hidd_Gfx__UpdateFB(cl, o, bm, srcX, srcY, destX, destY, xSize, ySize) \ +#define GFXHIDD__Hidd_Gfx__UpdateFB(cl, o, bm, srcX, srcY, destX, destY, xSize, ySize) \ do { \ - struct HIDDGraphicsData *__data = OOP_INST_DATA(cl, o); \ + struct HiddGfxData *__data = OOP_INST_DATA(cl, o); \ HIDD_Gfx_CopyBox(o, bm, srcX, srcY, \ __data->framebuffer, destX, destY, \ xSize, ySize, __data->gc); \ @@ -222,8 +226,8 @@ struct HIDDBitMapData #endif }; -#define NUM_ATTRBASES 9 -#define NUM_METHODBASES 4 +#define NUM_ATTRBASES 11 +#define NUM_METHODBASES 5 struct class_static_data { @@ -237,6 +241,7 @@ struct class_static_data OOP_AttrBase attrBases[NUM_ATTRBASES]; OOP_MethodID methodBases[NUM_METHODBASES]; + OOP_Class *gfxhwclass; /* graphics hw enumerator class */ OOP_Class *gfxhiddclass; /* graphics hidd class */ OOP_Class *bitmapclass; /* bitmap class */ OOP_Class *gcclass; /* graphics context class */ @@ -245,10 +250,11 @@ struct class_static_data OOP_Class *pixfmtclass; /* describing bitmap pixel formats */ OOP_Class *syncclass; /* describing gfxmode sync times */ - OOP_Class *planarbmclass; OOP_Class *chunkybmclass; + OOP_Object *gfxhwinstance; + /* Pixel format "database". This is a list of all pixelformats currently used by some bitmap. @@ -270,20 +276,24 @@ struct class_static_data #define __IHidd_Gfx (csd->attrBases[1]) #define __IHidd_GC (csd->attrBases[2]) #define __IHidd_ColorMap (csd->attrBases[3]) -#define __IHidd_Overlay (csd->attrBases[4]) -#define __IHidd_Sync (csd->attrBases[5]) -#define __IHidd_PixFmt (csd->attrBases[6]) -#define __IHidd_PlanarBM (csd->attrBases[7]) -#define __IHidd_ChunkyBM (csd->attrBases[8]) +#define __IHW (csd->attrBases[4]) +#define __IHidd (csd->attrBases[5]) +#define __IHidd_Overlay (csd->attrBases[6]) +#define __IHidd_Sync (csd->attrBases[7]) +#define __IHidd_PixFmt (csd->attrBases[8]) +#define __IHidd_PlanarBM (csd->attrBases[9]) +#define __IHidd_ChunkyBM (csd->attrBases[10]) #undef HiddGfxBase #undef HiddBitMapBase #undef HiddColorMapBase #undef HiddGCBase +#undef HWBase #define HiddBitMapBase (csd->methodBases[0]) #define HiddGfxBase (csd->methodBases[1]) #define HiddGCBase (csd->methodBases[2]) #define HiddColorMapBase (csd->methodBases[3]) +#define HWBase (csd->methodBases[4]) /* Library base */ diff --git a/rom/hidds/graphics/pixfmt.c b/rom/hidds/graphics/gfx_pixfmtclass.c similarity index 96% rename from rom/hidds/graphics/pixfmt.c rename to rom/hidds/graphics/gfx_pixfmtclass.c index e64d6eb910..44b2df202c 100644 --- a/rom/hidds/graphics/pixfmt.c +++ b/rom/hidds/graphics/gfx_pixfmtclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Pixelformat class @@ -8,18 +8,17 @@ /****************************************************************************************/ +#include "gfx_debug.h" + #include #include #include #include -#include +#include #include -#define DEBUG 0 -#include - -#include "graphics_intern.h" +#include "gfx_intern.h" /***************************************************************************************** diff --git a/rom/hidds/graphics/planarbm.c b/rom/hidds/graphics/gfx_planarbitmapclass.c similarity index 97% rename from rom/hidds/graphics/planarbm.c rename to rom/hidds/graphics/gfx_planarbitmapclass.c index 9adcee520a..2c6bab0ed8 100644 --- a/rom/hidds/graphics/planarbm.c +++ b/rom/hidds/graphics/gfx_planarbitmapclass.c @@ -1,13 +1,15 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Graphics planar bitmap class implementation. + Desc: Gfx Hidd planar bitmap class implementation. Lang: english */ /****************************************************************************************/ +#include "gfx_debug.h" + #include #include #include @@ -17,16 +19,11 @@ #include #include -#include - -#include - -#include "graphics_intern.h" +#include #include -#define DEBUG 0 -#include +#include "gfx_intern.h" /***************************************************************************************** @@ -34,7 +31,7 @@ --background_planarbm-- LOCATION - hidd.graphics.bitmap.planarbm + hidd.gfx.bitmap.planarbm NOTES This is a class representing a planar Amiga(tm) bitmap in AROS graphics subsystem. @@ -54,7 +51,7 @@ [I..], BOOL LOCATION - hidd.graphics.bitmap.planarbm + hidd.gfx.bitmap.planarbm FUNCTION Set this attribute to FALSE if you want to create an empty bitmap object containing @@ -85,7 +82,7 @@ [ISG], struct BitMap * LOCATION - hidd.graphics.bitmap.planarbm + hidd.gfx.bitmap.planarbm FUNCTION Allows to specify or retrieve a raw planar bitmap structure associated with the object. @@ -284,7 +281,7 @@ static BOOL PBM_SetBitMap(OOP_Class *cl, OOP_Object *o, struct BitMap *bm) pftags[0].ti_Data = bm->Depth; /* PixFmt_Depth */ pftags[1].ti_Data = bm->Depth; /* PixFmt_BitsPerPixel */ - pf = GFX__Hidd_Gfx__RegisterPixFmt(CSD(cl)->gfxhiddclass, pftags); + pf = GFXHIDD__Hidd_Gfx__RegisterPixFmt(CSD(cl)->gfxhiddclass, pftags); if (!pf) { diff --git a/rom/hidds/graphics/sync.c b/rom/hidds/graphics/gfx_syncclass.c similarity index 98% rename from rom/hidds/graphics/sync.c rename to rom/hidds/graphics/gfx_syncclass.c index bc164dcc17..c960b7c6b6 100644 --- a/rom/hidds/graphics/sync.c +++ b/rom/hidds/graphics/gfx_syncclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Sync info class @@ -8,6 +8,8 @@ /****************************************************************************************/ +#include "gfx_debug.h" + #include #include #include @@ -16,14 +18,11 @@ #include #include #include -#include - -#define DEBUG 0 -#include +#include #include -#include "graphics_intern.h" +#include "gfx_intern.h" #undef csd #define GfxBase csd->cs_GfxBase @@ -45,7 +44,7 @@ OOP_Object *Sync__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) /* * We need graphics.library in order to be able to create MonitorSpec. - * we do it here because graphics.hidd is initialized before + * we do it here because gfx.hidd is initialized before * graphics.library */ ObtainSemaphore(&csd->sema); @@ -146,7 +145,7 @@ OOP_Object *Sync__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) data->hmin = data->hdisp; data->vmin = data->vdisp; - if (GFX__Hidd_Gfx__GetFBModeQuick(csd->gfxhiddclass, data->gfxhidd) == vHidd_FrameBuffer_Mirrored) + if (GFXHIDD__Hidd_Gfx__GetFBModeQuick(csd->gfxhiddclass, data->gfxhidd) == vHidd_FrameBuffer_Mirrored) { /* But for mirrored framebuffer mode we can have larger bitmaps */ data->hmax = 16384; diff --git a/rom/hidds/graphics/graphics_init.c b/rom/hidds/graphics/graphics_init.c deleted file mode 100644 index d805b258da..0000000000 --- a/rom/hidds/graphics/graphics_init.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. - $Id$ - - Desc: Graphics hidd initialization code. - Lang: English. -*/ -#include -#include - -#include - -#include - -#include "graphics_intern.h" - -#include LC_LIBDEFS_FILE - -#undef SDEBUG -#undef DEBUG -#define DEBUG 0 -#include - -#undef csd - -static int GFX_Init(LIBBASETYPEPTR LIBBASE) -{ - struct class_static_data *csd = &LIBBASE->hdg_csd; - - EnterFunc(bug("GfxHIDD_Init()\n")); - - D(bug("[HiddGfx] GC class @ 0x%p\n", csd->gcclass)); - D(bug("[HiddGfx] BitMap class @ 0x%p\n", csd->bitmapclass)); - - csd->cs_GfxBase = NULL; - NEWLIST(&csd->pflist); - InitSemaphore(&csd->sema); - InitSemaphore(&csd->pfsema); - InitSemaphore(&csd->rgbconvertfuncs_sem); - - ReturnInt("GfxHIDD_Init", ULONG, TRUE); -} - -ADD2INITLIB(GFX_Init, -2) - diff --git a/rom/hidds/graphics/include/graphics.h b/rom/hidds/graphics/include/gfx.h similarity index 99% rename from rom/hidds/graphics/include/graphics.h rename to rom/hidds/graphics/include/gfx.h index b3b128f7ff..f42e412633 100644 --- a/rom/hidds/graphics/include/graphics.h +++ b/rom/hidds/graphics/include/gfx.h @@ -27,6 +27,8 @@ typedef OOP_Object *HIDDT_GC; /**** Graphics definitions ****************************************************/ +#define CLID_HW_Gfx "hw.gfx" + /* Sprite types */ #define vHidd_SpriteType_3Plus1 0x01 /* Color 0 transparent, 1-3 visible */ #define vHidd_SpriteType_2Plus1 0x02 /* Color 0 transparrent, 1 undefined, 2-3 visible */ diff --git a/rom/hidds/graphics/mmakefile.src b/rom/hidds/graphics/mmakefile.src index b4c2de3013..26b1c6843a 100644 --- a/rom/hidds/graphics/mmakefile.src +++ b/rom/hidds/graphics/mmakefile.src @@ -7,9 +7,19 @@ COLORCONVFILES := \ rgbconv_arch \ colorconv_init \ -FILES := graphics_init GraphicsClass BM_Class CM_Class GC_Class \ - planarbm chunkybm convertpixels memblit \ - pixfmt sync +FILES := \ + gfx_init \ + gfx_hwclass \ + gfx_hiddclass \ + gfx_bitmapclass \ + gfx_colormapclass \ + gfx_gcclass \ + gfx_planarbitmapclass \ + gfx_chunkybitmapclass \ + gfx_bitmapconvertpixels \ + gfx_bitmapmemblit \ + gfx_pixfmtclass \ + gfx_syncclass NOWARN_FLAGS := $(NOWARN_PARENTHESES) USER_CFLAGS := $(NOWARN_FLAGS) -DAROS_USE_OOP \ @@ -18,11 +28,11 @@ USER_CFLAGS := $(NOWARN_FLAGS) -DAROS_USE_OOP \ -D__UTILITY_NOLIBBASE__ USER_LDFLAGS := -static -%build_module mmake=kernel-hidd-graphics \ - modname=graphics modtype=hidd \ +%build_module mmake=kernel-hidd-gfx \ + modname=gfx modtype=hidd \ files="$(FILES) $(COLORCONVFILES)" -LIBNAME := graphics +LIBNAME := gfx INCLUDE_FILES := $(call WILDCARD, include/*.h) diff --git a/rom/hidds/graphics/rgbconv.c b/rom/hidds/graphics/rgbconv.c index a9d742de70..149770b3f0 100644 --- a/rom/hidds/graphics/rgbconv.c +++ b/rom/hidds/graphics/rgbconv.c @@ -1,10 +1,10 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include #include "colorconv/rgbconv_macros.h" #include "colorconv/rgbconv_rgbswap.h" diff --git a/rom/hidds/graphics/rgbconv_arch.c b/rom/hidds/graphics/rgbconv_arch.c index c17ac43eee..c74a65a5e7 100644 --- a/rom/hidds/graphics/rgbconv_arch.c +++ b/rom/hidds/graphics/rgbconv_arch.c @@ -1,10 +1,10 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include void SetArchRGBConversionFunctions(HIDDT_RGBConversionFunction rgbconvertfuncs[NUM_RGB_STDPIXFMT][NUM_RGB_STDPIXFMT]) { diff --git a/rom/hidds/vesa/mmakefile.src b/rom/hidds/vesa/mmakefile.src index b99aac23e2..e2ced3f650 100644 --- a/rom/hidds/vesa/mmakefile.src +++ b/rom/hidds/vesa/mmakefile.src @@ -2,12 +2,14 @@ include $(SRCDIR)/config/aros.cfg +#MM kernel-hidd-vesagfx : kernel-hidd-gfx-includes + FILES := \ vesagfx_init \ - vesagfxclass \ - hardware \ - bitmap + vesagfx_hiddclass \ + vesagfx_support \ + vesagfx_bitmapclass -%build_module mmake=kernel-hidd-vesa \ +%build_module mmake=kernel-hidd-vesagfx \ modname=vesagfx modtype=hidd \ files=$(FILES) diff --git a/rom/hidds/vesa/vesagfx.conf b/rom/hidds/vesa/vesagfx.conf index aafed9da8a..675c9930aa 100644 --- a/rom/hidds/vesa/vesagfx.conf +++ b/rom/hidds/vesa/vesagfx.conf @@ -1,17 +1,17 @@ ##begin config -basename PCVesa -libbasetype struct VesaGfxBase -version 42.3 +basename VESAGfx +libbasetype struct VESAGfxBase +version 45.0 residentpri 9 classptr_field vsd.vesagfxclass -classdatatype struct VesaGfx_data -classid CLID_Hidd_Gfx_Vesa +classdatatype struct VESAGfxHiddData +classid CLID_Hidd_Gfx_VESA superclass CLID_Hidd_Gfx ##end config ##begin cdefprivate -#include "vesagfxclass.h" -#include "bitmap.h" +#include "vesagfx_intern.h" +#include "vesagfx_hidd.h" ##end cdefprivate ##begin methodlist @@ -27,12 +27,12 @@ Show ##begin class ##begin config -basename PCVesaBM +basename VESAGfxBM type hidd classptr_field vsd.bmclass -classid CLID_Hidd_BitMap_Vesa +classid CLID_Hidd_BitMap_VESA superclass CLID_Hidd_ChunkyBM -classdatatype struct BitmapData +classdatatype struct VESAGfxBitMapData ##end config ##begin methodlist diff --git a/workbench/hidds/sm502/bitmap.h b/rom/hidds/vesa/vesagfx_bitmap.h similarity index 72% rename from workbench/hidds/sm502/bitmap.h rename to rom/hidds/vesa/vesagfx_bitmap.h index 50b25c48f6..52aa2c0390 100644 --- a/workbench/hidds/sm502/bitmap.h +++ b/rom/hidds/vesa/vesagfx_bitmap.h @@ -1,19 +1,22 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ -#ifndef _BITMAP_H -#define _BITMAP_H +#ifndef VESAGFX_BITMAP_H +#define VESAGFX_BITMAP_H -#include +#include + +#define CLID_Hidd_BitMap_VESA "hidd.bitmap.vesa" +#define IID_Hidd_BitMap_VESA "hidd.bitmap.vesa" #define IS_BM_ATTR(attr, idx) ( ( (idx) = (attr) - HiddBitMapAttrBase) < num_Hidd_BitMap_Attrs) /* This structure is used as instance data for the bitmap class. */ -struct BitmapData +struct VESAGfxBitMapData { UBYTE *VideoData; /* Pointing to video data */ LONG width; /* Bitmap size */ @@ -31,4 +34,4 @@ struct BitmapData LONG yoffset; }; -#endif /* _BITMAP_H */ +#endif /* VESAGFX_BITMAP_H */ diff --git a/rom/hidds/vesa/bitmap.c b/rom/hidds/vesa/vesagfx_bitmapclass.c similarity index 75% rename from rom/hidds/vesa/bitmap.c rename to rom/hidds/vesa/vesagfx_bitmapclass.c index 7554f579c0..02b084978a 100644 --- a/rom/hidds/vesa/bitmap.c +++ b/rom/hidds/vesa/vesagfx_bitmapclass.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Bitmap class for Vesa hidd. + Desc: Bitmap class for VESA Gfx hidd. Lang: English. */ @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #define DEBUG 0 @@ -23,24 +23,23 @@ #include -#include "bitmap.h" -#include "vesagfxclass.h" +#include "vesagfx_hidd.h" #include LC_LIBDEFS_FILE -#define MNAME_ROOT(x) PCVesaBM__Root__ ## x -#define MNAME_BM(x) PCVesaBM__Hidd_BitMap__ ## x +#define MNAME_ROOT(x) VESAGfxBM__Root__ ## x +#define MNAME_BM(x) VESAGfxBM__Hidd_BitMap__ ## x /*********** BitMap::New() *************************************/ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { - EnterFunc(bug("VesaGfx.BitMap::New()\n")); + EnterFunc(bug("VESAGfx.BitMap::New()\n")); o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg) msg); if (o) { OOP_MethodID disp_mid; - struct BitmapData *data; + struct VESAGfxBitMapData *data; HIDDT_ModeID modeid; OOP_Object *sync, *pf; @@ -61,17 +60,17 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) data->disp_width = OOP_GET(sync, aHidd_Sync_HDisp); data->disp_height = OOP_GET(sync, aHidd_Sync_VDisp); - D(bug("[VesaBitMap] Bitmap %ld x % ld, %u bytes per pixel, %u bytes per line\n", + D(bug("[VESAGfx:BitMap] Bitmap %ld x % ld, %u bytes per pixel, %u bytes per line\n", data->width, data->height, data->bytesperpix, data->bytesperline)); - D(bug("[VesaBitMap] Video data at 0x%p (%u bytes)\n", data->VideoData, data->bytesperline * data->height)); + D(bug("[VESAGfx:BitMap] Video data at 0x%p (%u bytes)\n", data->VideoData, data->bytesperline * data->height)); if (OOP_GET(data->pixfmtobj, aHidd_PixFmt_ColorModel) != vHidd_ColorModel_Palette) - ReturnPtr("VesaGfx.BitMap::New()", OOP_Object *, o); + ReturnPtr("VESAGfx.BitMap::New()", OOP_Object *, o); data->DAC = AllocMem(768, MEMF_ANY); - D(bug("[VesaBitMap] Palette data at 0x%p\n", data->DAC)); + D(bug("[VESAGfx:BitMap] Palette data at 0x%p\n", data->DAC)); if (data->DAC) - ReturnPtr("VesaGfx.BitMap::New()", OOP_Object *, o); + ReturnPtr("VESAGfx.BitMap::New()", OOP_Object *, o); disp_mid = OOP_GetMethodID(IID_Root, moRoot_Dispose); @@ -79,29 +78,29 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) o = NULL; } /* if created object */ - ReturnPtr("VesaGfx.BitMap::New()", OOP_Object *, o); + ReturnPtr("VESAGfx.BitMap::New()", OOP_Object *, o); } /********** Bitmap::Dispose() ***********************************/ VOID MNAME_ROOT(Dispose)(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct VESAGfxBitMapData *data = OOP_INST_DATA(cl, o); - D(bug("[VesaBitMap] Dispose(0x%p)\n", o)); + D(bug("[VESAGfx:BitMap] Dispose(0x%p)\n", o)); if (data->DAC) FreeMem(data->DAC, 768); OOP_DoSuperMethod(cl, o, msg); - ReturnVoid("VesaGfx.BitMap::Dispose"); + ReturnVoid("VESAGfx.BitMap::Dispose"); } /*** BitMap::Get() *******************************************/ VOID MNAME_ROOT(Get)(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct VESAGfxBitMapData *data = OOP_INST_DATA(cl, o); ULONG idx; if (IS_BM_ATTR(msg->attrID, idx)) @@ -120,7 +119,7 @@ VOID MNAME_ROOT(Get)(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct VESAGfxBitMapData *data = OOP_INST_DATA(cl, o); struct TagItem *tag, *tstate; ULONG idx; IPTR xoffset = data->xoffset; @@ -134,7 +133,7 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) switch(idx) { case aoHidd_BitMap_Visible: - D(bug("[VesaBitMap] Setting Visible to %d\n", tag->ti_Data)); + D(bug("[VESAGfx:BitMap] Setting Visible to %d\n", tag->ti_Data)); data->disp = tag->ti_Data; if (data->disp) { if (data->DAC) @@ -153,7 +152,7 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) if ((xoffset != data->xoffset) || (yoffset != data->yoffset)) { - D(bug("[VesaBitMap] Scroll to (%d, %d)\n", xoffset, yoffset)); + D(bug("[VESAGfx:BitMap] Scroll to (%d, %d)\n", xoffset, yoffset)); data->xoffset = xoffset; data->yoffset = yoffset; @@ -170,16 +169,16 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) BOOL MNAME_BM(SetColors)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetColors *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct VESAGfxBitMapData *data = OOP_INST_DATA(cl, o); struct HWData *hwdata = &XSD(cl)->data; ULONG xc_i, col_i; UBYTE p_shift; UWORD red, green, blue; - D(bug("[VesaBitMap] SetColors(%u, %u)\n", msg->firstColor, msg->numColors)); + D(bug("[VESAGfx:BitMap] SetColors(%u, %u)\n", msg->firstColor, msg->numColors)); if (!OOP_DoSuperMethod(cl, o, (OOP_Msg)msg)) { - D(bug("[VesaBitMap] DoSuperMethod() failed\n")); + D(bug("[VESAGfx:BitMap] DoSuperMethod() failed\n")); return FALSE; } @@ -210,9 +209,9 @@ BOOL MNAME_BM(SetColors)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetCo VOID MNAME_BM(UpdateRect)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_UpdateRect *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct VESAGfxBitMapData *data = OOP_INST_DATA(cl, o); - D(bug("[VesaBitMap] UpdateRect(%d, %d, %d, %d), bitmap 0x%p\n", msg->x, msg->y, msg->width, msg->height, o)); + D(bug("[VESAGfx:BitMap] UpdateRect(%d, %d, %d, %d), bitmap 0x%p\n", msg->x, msg->y, msg->width, msg->height, o)); if (data->disp) { LOCK_FRAMEBUFFER(XSD(cl)); vesaDoRefreshArea(&XSD(cl)->data, data, msg->x, msg->y, msg->x + msg->width, msg->y + msg->height); diff --git a/rom/hidds/vesa/mouse.h b/rom/hidds/vesa/vesagfx_cursor.h similarity index 55% rename from rom/hidds/vesa/mouse.h rename to rom/hidds/vesa/vesagfx_cursor.h index 4d62b0467f..2e6e6b0196 100644 --- a/rom/hidds/vesa/mouse.h +++ b/rom/hidds/vesa/vesagfx_cursor.h @@ -1,7 +1,7 @@ -#ifndef MOUSE_H -#define MOUSE_H +#ifndef VESAGFX_CURSOR_H +#define VESAGFX_CURSOR_H -#include +#include struct MouseData { APTR shape; @@ -13,4 +13,4 @@ struct MouseData { LONG visible; }; -#endif +#endif /* VESAGFX_CURSOR_H */ diff --git a/rom/hidds/vesa/vesagfx_hidd.h b/rom/hidds/vesa/vesagfx_hidd.h new file mode 100644 index 0000000000..006d17dfa4 --- /dev/null +++ b/rom/hidds/vesa/vesagfx_hidd.h @@ -0,0 +1,25 @@ +#ifndef VESAGFX_HIDD_H +#define VESAGFX_HIDD_H + +/* + Copyright © 2017, The AROS Development Team. All rights reserved. + $Id: vesagfxclass.h 51032 2015-08-29 22:49:55Z NicJA $ + + Desc: VESA Gfx Hidd data. + Lang: English. +*/ + +#include + +#include "vesagfx_bitmap.h" +#include "vesagfx_support.h" + +#define IID_Hidd_Gfx_VESA "hidd.gfx.vesa" +#define CLID_Hidd_Gfx_VESA "hidd.gfx.vesa" + +struct VESAGfxHiddData +{ + struct Interrupt ResetInterrupt; +}; + +#endif /* VESAGFX_HIDD_H */ diff --git a/rom/hidds/vesa/vesagfxclass.c b/rom/hidds/vesa/vesagfx_hiddclass.c similarity index 83% rename from rom/hidds/vesa/vesagfxclass.c rename to rom/hidds/vesa/vesagfx_hiddclass.c index 9e4ff4fd48..641e7d28f9 100644 --- a/rom/hidds/vesa/vesagfxclass.c +++ b/rom/hidds/vesa/vesagfx_hiddclass.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Class for Vesa. + Desc: Class for VESA. Lang: English. */ @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -26,9 +26,8 @@ #define DEBUG 0 #include -#include "vesagfxclass.h" -#include "bitmap.h" -#include "hardware.h" +#include "vesagfx_hidd.h" +#include "vesagfx_support.h" #include LC_LIBDEFS_FILE @@ -43,7 +42,7 @@ AROS_INTH1(ResetHandler, struct HWData *, hwdata) AROS_INTFUNC_EXIT } -OOP_Object *PCVesa__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +OOP_Object *VESAGfx__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { struct TagItem pftags[] = { @@ -87,7 +86,7 @@ OOP_Object *PCVesa__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *ms }; struct pRoot_New yourmsg; - EnterFunc(bug("VesaGfx::New()\n")); + EnterFunc(bug("VESAGfx::New()\n")); /* Protect against some stupid programmer wishing to create one more VESA driver */ @@ -116,7 +115,7 @@ OOP_Object *PCVesa__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *ms o = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg)&yourmsg); if (o) { - struct VesaGfx_data *data = OOP_INST_DATA(cl, o); + struct VESAGfxHiddData *data = OOP_INST_DATA(cl, o); D(bug("Got object from super\n")); XSD(cl)->vesagfxhidd = o; @@ -125,19 +124,19 @@ OOP_Object *PCVesa__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *ms data->ResetInterrupt.is_Data = &XSD(cl)->data; AddResetCallback(&data->ResetInterrupt); } - ReturnPtr("VesaGfx::New", OOP_Object *, o); + ReturnPtr("VESAGfx::New", OOP_Object *, o); } -VOID PCVesa__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) +VOID VESAGfx__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { - struct VesaGfx_data *data = OOP_INST_DATA(cl, o); + struct VESAGfxHiddData *data = OOP_INST_DATA(cl, o); RemResetCallback(&data->ResetInterrupt); OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); XSD(cl)->vesagfxhidd = NULL; } -VOID PCVesa__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) +VOID VESAGfx__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { ULONG idx; @@ -153,7 +152,7 @@ VOID PCVesa__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); } -OOP_Object *PCVesa__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) +OOP_Object *VESAGfx__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) { OOP_Object *object = NULL; @@ -199,40 +198,40 @@ OOP_Object *PCVesa__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct else object = (OOP_Object *)OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); - ReturnPtr("VesaGfx::CreateObject", OOP_Object *, object); + ReturnPtr("VESAGfx::CreateObject", OOP_Object *, object); } /********* GfxHidd::Show() ***************************/ -OOP_Object *PCVesa__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) +OOP_Object *VESAGfx__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) { - struct VesaGfx_staticdata *data = XSD(cl); + struct VESAGfx_staticdata *data = XSD(cl); struct TagItem tags[] = { {aHidd_BitMap_Visible, FALSE}, {TAG_DONE , 0 } }; - D(bug("[VesaGfx] Show(0x%p), old visible 0x%p\n", msg->bitMap, data->visible)); + D(bug("[VESAGfx] Show(0x%p), old visible 0x%p\n", msg->bitMap, data->visible)); LOCK_FRAMEBUFFER(data); /* Remove old bitmap from the screen */ if (data->visible) { - D(bug("[VesaGfx] Hiding old bitmap\n")); + D(bug("[VESAGfx] Hiding old bitmap\n")); OOP_SetAttrs(data->visible, tags); } if (msg->bitMap) { /* If we have a bitmap to show, set it as visible */ - D(bug("[VesaGfx] Showing new bitmap\n")); + D(bug("[VESAGfx] Showing new bitmap\n")); tags[0].ti_Data = TRUE; OOP_SetAttrs(msg->bitMap, tags); } else { - D(bug("[VesaGfx] Blanking screen\n")); + D(bug("[VESAGfx] Blanking screen\n")); /* Otherwise simply clear the framebuffer */ ClearBuffer(&data->data); } @@ -240,6 +239,6 @@ OOP_Object *PCVesa__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gf data->visible = msg->bitMap; UNLOCK_FRAMEBUFFER(data); - D(bug("[VesaGfx] Show() done\n")); + D(bug("[VESAGfx] Show() done\n")); return msg->bitMap; } diff --git a/rom/hidds/vesa/vesagfx_init.c b/rom/hidds/vesa/vesagfx_init.c index 20ce975c02..44b425d4f9 100644 --- a/rom/hidds/vesa/vesagfx_init.c +++ b/rom/hidds/vesa/vesagfx_init.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: vesa gfx Hidd for standalone i386 AROS + Desc: VESA Gfx Hidd for standalone i386 AROS Lang: english */ @@ -15,13 +15,13 @@ #include #include #include -#include +#include #include #include #include -#include "hardware.h" -#include "vesagfxclass.h" +#include "vesagfx_support.h" +#include "vesagfx_hidd.h" #include LC_LIBDEFS_FILE @@ -70,9 +70,9 @@ static const STRPTR interfaces[ATTRBASES_NUM] = IID_Hidd }; -static int PCVesa_Init(LIBBASETYPEPTR LIBBASE) +static int VESAGfx_Init(LIBBASETYPEPTR LIBBASE) { - struct VesaGfx_staticdata *xsd = &LIBBASE->vsd; + struct VESAGfx_staticdata *xsd = &LIBBASE->vsd; struct GfxBase *GfxBase; ULONG err; int res = FALSE; @@ -90,12 +90,12 @@ static int PCVesa_Init(LIBBASETYPEPTR LIBBASE) if (GetAttrBases(interfaces, xsd->attrBases, ATTRBASES_NUM)) { xsd->basebm = OOP_FindClass(CLID_Hidd_BitMap); - D(bug("[VESA] BitMap class @ 0x%p\n", xsd->basebm)); + D(bug("[VESAGfx] BitMap class @ 0x%p\n", xsd->basebm)); InitSemaphore(&xsd->framebufferlock); InitSemaphore(&xsd->HW_acc); - D(bug("[VESA] Init: Everything OK, installing driver\n")); + D(bug("[VESAGfx] Init: Everything OK, installing driver\n")); /* * It is unknown (and no way to know) what hardware part this driver uses. @@ -106,7 +106,7 @@ static int PCVesa_Init(LIBBASETYPEPTR LIBBASE) */ err = AddDisplayDriver(xsd->vesagfxclass, NULL, DDRV_BootMode, TRUE, TAG_DONE); - D(bug("[VESA] AddDisplayDriver() result: %u\n", err)); + D(bug("[VESAGfx] AddDisplayDriver() result: %u\n", err)); if (!err) { /* expunge protection */ @@ -119,9 +119,9 @@ static int PCVesa_Init(LIBBASETYPEPTR LIBBASE) } else { - D(bug("[VESA] Failed to open graphics.library!\n")); + D(bug("[VESAGfx] Failed to open graphics.library!\n")); } return res; } -ADD2INITLIB(PCVesa_Init, 0) +ADD2INITLIB(VESAGfx_Init, 0) diff --git a/rom/hidds/vesa/vesagfxclass.h b/rom/hidds/vesa/vesagfx_intern.h similarity index 61% rename from rom/hidds/vesa/vesagfxclass.h rename to rom/hidds/vesa/vesagfx_intern.h index 116089abda..d36ae10f77 100644 --- a/rom/hidds/vesa/vesagfxclass.h +++ b/rom/hidds/vesa/vesagfx_intern.h @@ -1,37 +1,31 @@ -#ifndef HIDD_VESAGFXCLASS_H -#define HIDD_VESAGFXCLASS_H +#ifndef VESAGFX_INTERN_H +#define VESAGFX_INTERN_H /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Some VesaGfx useful data. + Desc: VESA Gfx private data. Lang: English. */ -#include -#include -#include -#include -#include +#ifndef EXEC_LIBRARIES_H +# include +#endif -#include "bitmap.h" -#include "hardware.h" +#ifndef OOP_OOP_H +# include +#endif -#define IID_Hidd_Gfx_Vesa "hidd.gfx.vesa" -#define CLID_Hidd_Gfx_Vesa "hidd.gfx.vesa" +#ifndef EXEC_SEMAPHORES_H +# include +#endif -#define CLID_Hidd_BitMap_Vesa "hidd.bitmap.vesa" -#define IID_Hidd_BitMap_Vesa "hidd.bitmap.vesa" - -struct VesaGfx_data -{ - struct Interrupt ResetInterrupt; -}; +#include "vesagfx_support.h" #define ATTRBASES_NUM 6 -struct VesaGfx_staticdata +struct VESAGfx_staticdata { OOP_Class *basebm; /* baseclass for CreateObject */ @@ -45,16 +39,16 @@ struct VesaGfx_staticdata OOP_AttrBase attrBases[ATTRBASES_NUM]; }; -struct VesaGfxBase +struct VESAGfxBase { struct Library library; - struct VesaGfx_staticdata vsd; + struct VESAGfx_staticdata vsd; }; #define LOCK_FRAMEBUFFER(xsd) ObtainSemaphore(&xsd->framebufferlock) #define UNLOCK_FRAMEBUFFER(xsd) ReleaseSemaphore(&xsd->framebufferlock) -#define XSD(cl) (&((struct VesaGfxBase *)cl->UserData)->vsd) +#define XSD(cl) (&((struct VESAGfxBase *)cl->UserData)->vsd) #undef HiddChunkyBMAttrBase #undef HiddBitMapAttrBase @@ -71,4 +65,4 @@ struct VesaGfxBase #define HiddSyncAttrBase XSD(cl)->attrBases[4] #define HiddAttrBase XSD(cl)->attrBases[5] -#endif /* HIDD_VESAGFXCLASS_H */ +#endif /* VESAGFX_INTERN_H */ diff --git a/rom/hidds/vesa/hardware.c b/rom/hidds/vesa/vesagfx_support.c similarity index 92% rename from rom/hidds/vesa/hardware.c rename to rom/hidds/vesa/vesagfx_support.c index 5ec639e980..0ab159828a 100644 --- a/rom/hidds/vesa/hardware.c +++ b/rom/hidds/vesa/vesagfx_support.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: vesa "hardware" functions + Desc: VESA Gfx hardware support functions Lang: English */ @@ -21,9 +21,8 @@ #include #include -#include "bitmap.h" -#include "vesagfxclass.h" -#include "hardware.h" +#include "vesagfx_intern.h" +#include "vesagfx_hidd.h" #include @@ -103,7 +102,7 @@ BOOL initVesaGfxHW(struct HWData *data) return FALSE; } -void vesaDoRefreshArea(struct HWData *hwdata, struct BitmapData *data, +void vesaDoRefreshArea(struct HWData *hwdata, struct VESAGfxBitMapData *data, LONG x1, LONG y1, LONG x2, LONG y2) { UBYTE *src, *dst; @@ -189,7 +188,7 @@ AROS_UFH3(void, Enumerator, struct pHidd_PCIDriver_MapPCI mappci,*msg = &mappci; struct HWData *sd = hook->h_Data; - D(bug("[VESA] Enumerator: Found device\n")); + D(bug("[VESAGfx] Enumerator: Found device\n")); OOP_GetAttr(pciDevice, aHidd_PCIDevice_Driver, (APTR)&driver); OOP_GetAttr(pciDevice, aHidd_PCIDevice_VendorID, &Vendor); @@ -211,7 +210,7 @@ AROS_UFH3(void, Enumerator, mappci.Length = size; sd->framebuffer = (APTR)OOP_DoMethod(driver, (OOP_Msg)msg); - D(bug("[VESA] Got framebuffer @ %x (size=%x)\n", sd->framebuffer, size)); + D(bug("[VESAGfx] Got framebuffer @ %x (size=%x)\n", sd->framebuffer, size)); AROS_USERFUNC_EXIT } @@ -220,14 +219,14 @@ static void Find_PCI_Card(struct HWData *sd) { OOP_Object *pci; - D(bug("[VESA] Find_PCI_Card\n")); + D(bug("[VESAGfx] Find_PCI_Card\n")); sd->pciDeviceAttrBase = OOP_ObtainAttrBase(IID_Hidd_PCIDevice); if (sd->pciDeviceAttrBase) { pci = OOP_NewObject(NULL, CLID_Hidd_PCI, NULL); - D(bug("[VESA] Creating PCI object\n")); + D(bug("[VESAGfx] Creating PCI object\n")); if (pci) { @@ -248,7 +247,7 @@ static void Find_PCI_Card(struct HWData *sd) callback: &FindHook, requirements: (struct TagItem*)&Requirements, }, *msg = &enummsg; - D(bug("[VESA] Calling search Hook\n")); + D(bug("[VESAGfx] Calling search Hook\n")); OOP_DoMethod(pci, (OOP_Msg)msg); OOP_DisposeObject(pci); } @@ -261,7 +260,7 @@ static void Find_PCI_Card(struct HWData *sd) ** DACLoad -- ** load a palette */ -void DACLoad(struct VesaGfx_staticdata *xsd, UBYTE *DAC, +void DACLoad(struct VESAGfx_staticdata *xsd, UBYTE *DAC, unsigned char first, int num) { int i, n; diff --git a/rom/hidds/vesa/hardware.h b/rom/hidds/vesa/vesagfx_support.h similarity index 73% rename from rom/hidds/vesa/hardware.h rename to rom/hidds/vesa/vesagfx_support.h index d19b61f9a2..033b0adb8d 100644 --- a/rom/hidds/vesa/hardware.h +++ b/rom/hidds/vesa/vesagfx_support.h @@ -1,5 +1,5 @@ -#ifndef HARDWARE_H -#define HARDWARE_H +#ifndef VESAGFX_SUPPORT_H +#define VESAGFX_SUPPORT_H #include #include @@ -34,13 +34,13 @@ struct HWData #undef HiddPCIDeviceAttrBase #define HiddPCIDeviceAttrBase sd->pciDeviceAttrBase -struct VesaGfx_staticdata; -struct BitmapData; +struct VESAGfx_staticdata; +struct VESAGfxBitMapData; BOOL initVesaGfxHW(struct HWData *); -void DACLoad(struct VesaGfx_staticdata *, UBYTE *, unsigned char, int); +void DACLoad(struct VESAGfx_staticdata *, UBYTE *, unsigned char, int); void ClearBuffer(struct HWData *data); -void vesaDoRefreshArea(struct HWData *hwdata, struct BitmapData *data, +void vesaDoRefreshArea(struct HWData *hwdata, struct VESAGfxBitMapData *data, LONG x1, LONG y1, LONG x2, LONG y2); -#endif +#endif /* VESAGFX_SUPPORT_H */ diff --git a/rom/intuition/inputhandler_support.c b/rom/intuition/inputhandler_support.c index 163c23233f..a82630fdc9 100644 --- a/rom/intuition/inputhandler_support.c +++ b/rom/intuition/inputhandler_support.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. Copyright © 2001-2003, The MorphOS Development Team. All Rights Reserved. $Id$ @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "inputhandler.h" diff --git a/rom/intuition/intuition_init.c b/rom/intuition/intuition_init.c index c866171d5d..d9ece952d4 100644 --- a/rom/intuition/intuition_init.c +++ b/rom/intuition/intuition_init.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. Copyright © 2001-2013, The MorphOS Development Team. All Rights Reserved. $Id$ */ @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/rom/intuition/intuition_misc.c b/rom/intuition/intuition_misc.c index f8a70a5223..cffe3d7d8d 100644 --- a/rom/intuition/intuition_misc.c +++ b/rom/intuition/intuition_misc.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. Copyright © 2001-2013, The MorphOS Development Team. All Rights Reserved. $Id$ */ @@ -24,7 +24,7 @@ #include #include #include -#include +#include #ifdef SKINS # include "intuition_customize.h" diff --git a/rom/intuition/monitorclass.c b/rom/intuition/monitorclass.c index eb640f9152..81372caf59 100644 --- a/rom/intuition/monitorclass.c +++ b/rom/intuition/monitorclass.c @@ -1,11 +1,11 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include #include -#include +#include #include #include #include diff --git a/rom/intuition/openscreen.c b/rom/intuition/openscreen.c index 455eab0561..b3ccf79c82 100644 --- a/rom/intuition/openscreen.c +++ b/rom/intuition/openscreen.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. Copyright © 2001-2013, The MorphOS Development Team. All Rights Reserved. $Id$ @@ -44,7 +44,7 @@ #include #include #else -#include +#include #endif #include "intuition_intern.h" #include "intuition_customize.h" diff --git a/rom/intuition/pointerclass.c b/rom/intuition/pointerclass.c index f96b7409a1..f9e4860ec1 100644 --- a/rom/intuition/pointerclass.c +++ b/rom/intuition/pointerclass.c @@ -1,10 +1,10 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. Copyright © 2001-2003, The MorphOS Development Team. All Rights Reserved. $Id$ */ -#include +#include #include #include #include diff --git a/rom/intuition/screenclass.c b/rom/intuition/screenclass.c index 3a58e72594..f28d6c7773 100644 --- a/rom/intuition/screenclass.c +++ b/rom/intuition/screenclass.c @@ -1,11 +1,11 @@ /* - Copyright © 2013-2014, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ #include #include -#include +#include #include #include #include diff --git a/rom/mmakefile.src b/rom/mmakefile.src index 62685d0c53..73a0e82cf7 100644 --- a/rom/mmakefile.src +++ b/rom/mmakefile.src @@ -9,7 +9,7 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-debug \ #MM kernel-fs-con \ #MM kernel-graphics \ -#MM kernel-hidd-graphics \ +#MM kernel-hidd-gfx \ #MM kernel-hidd-kbd \ #MM kernel-hidd-mouse \ #MM kernel-utility \ @@ -41,6 +41,7 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-efi-includes \ #MM kernel-hidd-includes \ #MM kernel-hostlib-includes \ +#MM kernel-hidd-gfx-includes \ #MM kernel-graphics-includes \ #MM kernel-utility-includes \ #MM kernel-intuition-includes \ @@ -80,7 +81,7 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-dosboot \ #MM kernel-filesystem \ #MM kernel-graphics \ -#MM kernel-hidd-graphics \ +#MM kernel-hidd-gfx \ #MM kernel-hidd-kbd \ #MM kernel-hidd-mouse \ #MM kernel-utility \ @@ -110,7 +111,7 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-fs-ram \ #MM kernel-fs-con \ #MM kernel-graphics \ -#MM kernel-hidd-graphics \ +#MM kernel-hidd-gfx \ #MM kernel-hidd-kbd \ #MM kernel-hidd-mouse \ #MM kernel-utility \ @@ -130,7 +131,7 @@ include $(SRCDIR)/config/aros.cfg BASE_DEVICES := console input gameport keyboard BASE_HANDLERS := ram con -BASE_HIDD := hiddclass graphics keyboard mouse +BASE_HIDD := hiddclass gfx keyboard mouse BASE_LIBS := aros debug dos graphics intuition keymap layers oop utility BASE_RSRCS := bootloader dosboot FileSystem lddemon diff --git a/test/cplusplus/headertest.cpp b/test/cplusplus/headertest.cpp index c4f9a54a4e..89a828543e 100644 --- a/test/cplusplus/headertest.cpp +++ b/test/cplusplus/headertest.cpp @@ -547,7 +547,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/hidds/graphics/convertpixels.c b/test/hidds/gfx/convertpixels.c similarity index 96% rename from test/hidds/graphics/convertpixels.c rename to test/hidds/gfx/convertpixels.c index 602f2c03d3..1b4de1da84 100644 --- a/test/hidds/graphics/convertpixels.c +++ b/test/hidds/gfx/convertpixels.c @@ -1,11 +1,11 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #define __OOP_NOATTRBASES__ -#include +#include #include #include diff --git a/test/hidds/graphics/hiddmodeid.c b/test/hidds/gfx/hiddmodeid.c similarity index 96% rename from test/hidds/graphics/hiddmodeid.c rename to test/hidds/gfx/hiddmodeid.c index 27605caffb..7c521fac2a 100644 --- a/test/hidds/graphics/hiddmodeid.c +++ b/test/hidds/gfx/hiddmodeid.c @@ -1,11 +1,11 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include #include -#include +#include #include #include diff --git a/test/hidds/graphics/mmakefile.src b/test/hidds/gfx/mmakefile.src similarity index 86% rename from test/hidds/graphics/mmakefile.src rename to test/hidds/gfx/mmakefile.src index 29bec5602b..c7587ab46c 100644 --- a/test/hidds/graphics/mmakefile.src +++ b/test/hidds/gfx/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -EXEDIR := $(AROS_TESTS)/hidds/graphics +EXEDIR := $(AROS_TESTS)/hidds/gfx FILES := \ convertpixels \ diff --git a/test/hidds/graphics/modeid.c b/test/hidds/gfx/modeid.c similarity index 97% rename from test/hidds/graphics/modeid.c rename to test/hidds/gfx/modeid.c index 1592d25630..564fb1cee6 100644 --- a/test/hidds/graphics/modeid.c +++ b/test/hidds/gfx/modeid.c @@ -1,11 +1,11 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include #include -#include +#include #include #include #include diff --git a/test/hidds/graphics/obsolete/BitMapNewDispose.c b/test/hidds/gfx/obsolete/BitMapNewDispose.c similarity index 100% rename from test/hidds/graphics/obsolete/BitMapNewDispose.c rename to test/hidds/gfx/obsolete/BitMapNewDispose.c diff --git a/test/hidds/graphics/obsolete/GCCopyArea.c b/test/hidds/gfx/obsolete/GCCopyArea.c similarity index 100% rename from test/hidds/graphics/obsolete/GCCopyArea.c rename to test/hidds/gfx/obsolete/GCCopyArea.c diff --git a/test/hidds/graphics/obsolete/GCDrawEllipse.c b/test/hidds/gfx/obsolete/GCDrawEllipse.c similarity index 100% rename from test/hidds/graphics/obsolete/GCDrawEllipse.c rename to test/hidds/gfx/obsolete/GCDrawEllipse.c diff --git a/test/hidds/graphics/obsolete/GCDrawLine.c b/test/hidds/gfx/obsolete/GCDrawLine.c similarity index 100% rename from test/hidds/graphics/obsolete/GCDrawLine.c rename to test/hidds/gfx/obsolete/GCDrawLine.c diff --git a/test/hidds/graphics/obsolete/GCDrawPolygon.c b/test/hidds/gfx/obsolete/GCDrawPolygon.c similarity index 100% rename from test/hidds/graphics/obsolete/GCDrawPolygon.c rename to test/hidds/gfx/obsolete/GCDrawPolygon.c diff --git a/test/hidds/graphics/obsolete/GCDrawRect.c b/test/hidds/gfx/obsolete/GCDrawRect.c similarity index 100% rename from test/hidds/graphics/obsolete/GCDrawRect.c rename to test/hidds/gfx/obsolete/GCDrawRect.c diff --git a/test/hidds/graphics/obsolete/GCDrawText.c b/test/hidds/gfx/obsolete/GCDrawText.c similarity index 100% rename from test/hidds/graphics/obsolete/GCDrawText.c rename to test/hidds/gfx/obsolete/GCDrawText.c diff --git a/test/hidds/graphics/obsolete/GCNewDispose.c b/test/hidds/gfx/obsolete/GCNewDispose.c similarity index 100% rename from test/hidds/graphics/obsolete/GCNewDispose.c rename to test/hidds/gfx/obsolete/GCNewDispose.c diff --git a/test/hidds/graphics/obsolete/GCReadWritePixelDirect.c b/test/hidds/gfx/obsolete/GCReadWritePixelDirect.c similarity index 100% rename from test/hidds/graphics/obsolete/GCReadWritePixelDirect.c rename to test/hidds/gfx/obsolete/GCReadWritePixelDirect.c diff --git a/test/hidds/graphics/obsolete/GCWritePixel.c b/test/hidds/gfx/obsolete/GCWritePixel.c similarity index 100% rename from test/hidds/graphics/obsolete/GCWritePixel.c rename to test/hidds/gfx/obsolete/GCWritePixel.c diff --git a/test/hidds/graphics/obsolete/ReadMe.txt b/test/hidds/gfx/obsolete/ReadMe.txt similarity index 100% rename from test/hidds/graphics/obsolete/ReadMe.txt rename to test/hidds/gfx/obsolete/ReadMe.txt diff --git a/test/hidds/graphics/obsolete/gfxhiddtool.c b/test/hidds/gfx/obsolete/gfxhiddtool.c similarity index 100% rename from test/hidds/graphics/obsolete/gfxhiddtool.c rename to test/hidds/gfx/obsolete/gfxhiddtool.c diff --git a/test/hidds/graphics/obsolete/gfxhiddtool.h b/test/hidds/gfx/obsolete/gfxhiddtool.h similarity index 100% rename from test/hidds/graphics/obsolete/gfxhiddtool.h rename to test/hidds/gfx/obsolete/gfxhiddtool.h diff --git a/test/hidds/graphics/obsolete/mmakefile.src b/test/hidds/gfx/obsolete/mmakefile.src similarity index 100% rename from test/hidds/graphics/obsolete/mmakefile.src rename to test/hidds/gfx/obsolete/mmakefile.src diff --git a/workbench/c/Decoration/drawfuncs.c b/workbench/c/Decoration/drawfuncs.c index bdbcb64045..64c8b1f41e 100644 --- a/workbench/c/Decoration/drawfuncs.c +++ b/workbench/c/Decoration/drawfuncs.c @@ -1,5 +1,5 @@ /* - Copyright © 2011-2016, The AROS Development Team. + Copyright © 2011-2017, The AROS Development Team. $Id$ */ @@ -14,7 +14,7 @@ #include #include -#include +#include #include diff --git a/workbench/devs/monitors/Compositor/compositorclass.c b/workbench/devs/monitors/Compositor/compositorclass.c index 19fe92b5b6..b2b94f8bf5 100644 --- a/workbench/devs/monitors/Compositor/compositorclass.c +++ b/workbench/devs/monitors/Compositor/compositorclass.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include "compositor_intern.h" diff --git a/workbench/devs/monitors/Compositor/include/compositor.h b/workbench/devs/monitors/Compositor/include/compositor.h index 0fb4eba237..fdff1cb724 100644 --- a/workbench/devs/monitors/Compositor/include/compositor.h +++ b/workbench/devs/monitors/Compositor/include/compositor.h @@ -1,7 +1,7 @@ #ifndef HIDD_COMPOSITOR_H #define HIDD_COMPOSITOR_H /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -18,7 +18,7 @@ #endif #ifndef HIDD_GRAPHICS -# include +# include #endif /* diff --git a/workbench/devs/monitors/IntelGMA/3D_blitter.c b/workbench/devs/monitors/IntelGMA/3D_blitter.c index 8710f69bc4..6a593d779e 100644 --- a/workbench/devs/monitors/IntelGMA/3D_blitter.c +++ b/workbench/devs/monitors/IntelGMA/3D_blitter.c @@ -1,10 +1,10 @@ /* - Copyright © 2012, The AROS Development Team. All rights reserved. + Copyright © 2012-2017, The AROS Development Team. All rights reserved. $Id$ */ /* - * Copyright © 2011 Intel Corporation + * Copyright © 2011 Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -27,14 +27,14 @@ * * Authors: * Chris Wilson (intel-gpu-tools) - * 2012, The AROS Development Team. + * 2012-2017, The AROS Development Team. */ #include -#include +#include #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" //#include "i915/i915_reg.h" // crashes !? diff --git a/workbench/devs/monitors/IntelGMA/compositing.h b/workbench/devs/monitors/IntelGMA/compositing.h index 94705bdddd..c30100aa85 100644 --- a/workbench/devs/monitors/IntelGMA/compositing.h +++ b/workbench/devs/monitors/IntelGMA/compositing.h @@ -18,7 +18,7 @@ #endif #ifndef HIDD_GRAPHICS -# include +# include #endif /* Compositing interface */ diff --git a/workbench/devs/monitors/IntelGMA/intelG45_bitmap.c b/workbench/devs/monitors/IntelGMA/intelgma_bitmapclass.c similarity index 99% rename from workbench/devs/monitors/IntelGMA/intelG45_bitmap.c rename to workbench/devs/monitors/IntelGMA/intelgma_bitmapclass.c index 0113a33fc7..db64b09432 100644 --- a/workbench/devs/monitors/IntelGMA/intelG45_bitmap.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ #include #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" #include "compositing.h" diff --git a/workbench/devs/monitors/IntelGMA/compositing_intern.h b/workbench/devs/monitors/IntelGMA/intelgma_compositor.h similarity index 95% rename from workbench/devs/monitors/IntelGMA/compositing_intern.h rename to workbench/devs/monitors/IntelGMA/intelgma_compositor.h index 0b767bd176..97e1444ef6 100644 --- a/workbench/devs/monitors/IntelGMA/compositing_intern.h +++ b/workbench/devs/monitors/IntelGMA/intelgma_compositor.h @@ -1,7 +1,7 @@ #ifndef _COMPOSITING_INTERN_H #define _COMPOSITING_INTERN_H /* - Copyright © 2010, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/devs/monitors/IntelGMA/compositingclass.c b/workbench/devs/monitors/IntelGMA/intelgma_compositorclass.c similarity index 99% rename from workbench/devs/monitors/IntelGMA/compositingclass.c rename to workbench/devs/monitors/IntelGMA/intelgma_compositorclass.c index 669aa6bd0a..a4b28af6d5 100644 --- a/workbench/devs/monitors/IntelGMA/compositingclass.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_compositorclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2010-2016, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -21,10 +21,10 @@ #include /* Non generic part */ -#include "intelG45_intern.h" +#include "intelgma_hidd.h" /* Non generic part */ -#include "compositing_intern.h" +#include "intelgma_compositor.h" #define MAX(a,b) a > b ? a : b #define MIN(a,b) a < b ? a : b diff --git a/workbench/devs/monitors/IntelGMA/gallium_intern.h b/workbench/devs/monitors/IntelGMA/intelgma_gallium.h similarity index 80% rename from workbench/devs/monitors/IntelGMA/gallium_intern.h rename to workbench/devs/monitors/IntelGMA/intelgma_gallium.h index cc65e1623a..5bcf8f2799 100644 --- a/workbench/devs/monitors/IntelGMA/gallium_intern.h +++ b/workbench/devs/monitors/IntelGMA/intelgma_gallium.h @@ -1,5 +1,5 @@ /* - Copyright © 2011-2015, The AROS Development Team. All rights reserved. + Copyright © 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/devs/monitors/IntelGMA/galliumclass.c b/workbench/devs/monitors/IntelGMA/intelgma_galliumclass.c similarity index 97% rename from workbench/devs/monitors/IntelGMA/galliumclass.c rename to workbench/devs/monitors/IntelGMA/intelgma_galliumclass.c index 5bd9d5cdac..853eb6d003 100644 --- a/workbench/devs/monitors/IntelGMA/galliumclass.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_galliumclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2011-2015, The AROS Development Team. All rights reserved. + Copyright © 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -18,9 +18,9 @@ #include #include -#include "intelG45_intern.h" -#include "aros_winsys.h" -#include "gallium_intern.h" +#include "intelgma_hidd.h" +#include "intelgma_winsys.h" +#include "intelgma_gallium.h" #include "intelG45_regs.h" #include "i915/i915_public.h" diff --git a/workbench/devs/monitors/IntelGMA/intelG45_intern.h b/workbench/devs/monitors/IntelGMA/intelgma_hidd.h similarity index 99% rename from workbench/devs/monitors/IntelGMA/intelG45_intern.h rename to workbench/devs/monitors/IntelGMA/intelgma_hidd.h index a3110cf0df..1875a3d719 100644 --- a/workbench/devs/monitors/IntelGMA/intelG45_intern.h +++ b/workbench/devs/monitors/IntelGMA/intelgma_hidd.h @@ -1,5 +1,5 @@ /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/workbench/devs/monitors/IntelGMA/intelG45_class.c b/workbench/devs/monitors/IntelGMA/intelgma_hiddclass.c similarity index 99% rename from workbench/devs/monitors/IntelGMA/intelG45_class.c rename to workbench/devs/monitors/IntelGMA/intelgma_hiddclass.c index 9d906c4432..15578ac557 100644 --- a/workbench/devs/monitors/IntelGMA/intelG45_class.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -20,9 +20,9 @@ #include #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" -#include "gallium_intern.h" +#include "intelgma_gallium.h" #include "compositing.h" #define sd ((struct g45staticdata*)SD(cl)) diff --git a/workbench/devs/monitors/IntelGMA/intelG45_i2c.c b/workbench/devs/monitors/IntelGMA/intelgma_i2cclass.c similarity index 95% rename from workbench/devs/monitors/IntelGMA/intelG45_i2c.c rename to workbench/devs/monitors/IntelGMA/intelgma_i2cclass.c index 9070706d4d..7418bb34f6 100644 --- a/workbench/devs/monitors/IntelGMA/intelG45_i2c.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_i2cclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2010-2011, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -14,7 +14,7 @@ #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" void METHOD(INTELI2C, Hidd_I2C, PutBits) diff --git a/workbench/devs/monitors/IntelGMA/intelG45_init.c b/workbench/devs/monitors/IntelGMA/intelgma_init.c similarity index 99% rename from workbench/devs/monitors/IntelGMA/intelG45_init.c rename to workbench/devs/monitors/IntelGMA/intelgma_init.c index c9ee35b4ae..0fa79586b3 100644 --- a/workbench/devs/monitors/IntelGMA/intelG45_init.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_init.c @@ -1,5 +1,5 @@ /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -10,14 +10,14 @@ #include #include #include -#include +#include #include #include #include #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" #include "compositing.h" @@ -533,4 +533,4 @@ int G45_Init(struct g45staticdata *sd) return FALSE; } -ADD2LIBS((STRPTR)"graphics.hidd", 0, static struct Library *, __gfxbase); +ADD2LIBS((STRPTR)"gfx.hidd", 0, static struct Library *, __gfxbase); diff --git a/workbench/devs/monitors/IntelGMA/intelG45_memory.c b/workbench/devs/monitors/IntelGMA/intelgma_memory.c similarity index 98% rename from workbench/devs/monitors/IntelGMA/intelG45_memory.c rename to workbench/devs/monitors/IntelGMA/intelgma_memory.c index fe7c92557f..0494ff08aa 100644 --- a/workbench/devs/monitors/IntelGMA/intelG45_memory.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_memory.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -8,7 +8,7 @@ #include #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" static void G45_AttachMemory(struct g45staticdata *sd, intptr_t physical, diff --git a/workbench/devs/monitors/IntelGMA/startup.c b/workbench/devs/monitors/IntelGMA/intelgma_startup.c similarity index 97% rename from workbench/devs/monitors/IntelGMA/startup.c rename to workbench/devs/monitors/IntelGMA/intelgma_startup.c index 6a3dfd3571..b875cf8e78 100644 --- a/workbench/devs/monitors/IntelGMA/startup.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_startup.c @@ -1,11 +1,11 @@ /* - Copyright © 2011-2016, The AROS Development Team. All rights reserved. + Copyright © 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ #include #include -#include +#include #include #include #include @@ -18,9 +18,9 @@ #include #include -#include "intelG45_intern.h" -#include "compositing_intern.h" -#include "gallium_intern.h" +#include "intelgma_hidd.h" +#include "intelgma_compositor.h" +#include "intelgma_gallium.h" struct Library *OOPBase; struct Library *UtilityBase; diff --git a/workbench/devs/monitors/IntelGMA/intelG45_lowlevel.c b/workbench/devs/monitors/IntelGMA/intelgma_support.c similarity index 99% rename from workbench/devs/monitors/IntelGMA/intelG45_lowlevel.c rename to workbench/devs/monitors/IntelGMA/intelgma_support.c index 4818c4cdb3..de1e83dd29 100644 --- a/workbench/devs/monitors/IntelGMA/intelG45_lowlevel.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_support.c @@ -1,5 +1,5 @@ /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ #include #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" typedef struct { diff --git a/workbench/devs/monitors/IntelGMA/aros_winsys.c b/workbench/devs/monitors/IntelGMA/intelgma_winsys.c similarity index 99% rename from workbench/devs/monitors/IntelGMA/aros_winsys.c rename to workbench/devs/monitors/IntelGMA/intelgma_winsys.c index f38421f061..99b41a3785 100644 --- a/workbench/devs/monitors/IntelGMA/aros_winsys.c +++ b/workbench/devs/monitors/IntelGMA/intelgma_winsys.c @@ -1,5 +1,5 @@ /* - Copyright © 2011-2015, The AROS Development Team. All rights reserved. + Copyright © 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -7,9 +7,9 @@ #include -#include "intelG45_intern.h" +#include "intelgma_hidd.h" #include "intelG45_regs.h" -#include "aros_winsys.h" +#include "intelgma_winsys.h" #include "util/u_memory.h" #include "i915/i915_winsys.h" diff --git a/workbench/devs/monitors/IntelGMA/aros_winsys.h b/workbench/devs/monitors/IntelGMA/intelgma_winsys.h similarity index 100% rename from workbench/devs/monitors/IntelGMA/aros_winsys.h rename to workbench/devs/monitors/IntelGMA/intelgma_winsys.h diff --git a/workbench/devs/monitors/IntelGMA/mmakefile.src b/workbench/devs/monitors/IntelGMA/mmakefile.src index d1e0424a1a..adfbf35fb2 100644 --- a/workbench/devs/monitors/IntelGMA/mmakefile.src +++ b/workbench/devs/monitors/IntelGMA/mmakefile.src @@ -2,6 +2,17 @@ include $(SRCDIR)/config/aros.cfg +IGMA_HIDD_SOURCES := \ + intelgma_init \ + intelgma_i2cclass \ + intelgma_hiddclass \ + intelgma_bitmapclass \ + intelgma_support \ + intelgma_memory \ + intelgma_startup \ + intelgma_galliumclass \ + intelgma_compositorclass + GALLIUM_I915_SOURCES = \ drivers/i915/i915_blit \ drivers/i915/i915_clear \ @@ -35,11 +46,9 @@ USER_INCLUDES := \ -I$(AROS_DEVELOPMENT)/include/gallium \ -I$(GALLIUM_PATH)/include - USER_CFLAGS := -std=gnu99 +USER_CFLAGS := -std=gnu99 -FILES := intelG45_init intelG45_class intelG45_i2c intelG45_bitmap \ - intelG45_lowlevel intelG45_memory compositingclass startup \ - galliumclass aros_winsys 3D_blitter \ +FILES := $(IGMA_HIDD_SOURCES) intelgma_winsys 3D_blitter \ $(addprefix $(GALLIUM_PATH), $(GALLIUM_I915_SOURCES)) EXEDIR := $(AROSDIR)/Devs/Monitors diff --git a/workbench/hidds/nouveau/compositor.h b/workbench/hidds/nouveau/compositor.h index 708d426ecd..aa8e0c1002 100644 --- a/workbench/hidds/nouveau/compositor.h +++ b/workbench/hidds/nouveau/compositor.h @@ -1,7 +1,7 @@ #ifndef HIDD_COMPOSITOR_H #define HIDD_COMPOSITOR_H /* - Copyright © 2010-2013, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -18,7 +18,7 @@ #endif #ifndef HIDD_GRAPHICS -# include +# include #endif /* Compositor interface */ diff --git a/workbench/hidds/nouveau/mmakefile.src b/workbench/hidds/nouveau/mmakefile.src index 9f37b15988..1088cd7296 100644 --- a/workbench/hidds/nouveau/mmakefile.src +++ b/workbench/hidds/nouveau/mmakefile.src @@ -99,14 +99,14 @@ DRM_PATH = $(SRCDIR)/$(CURDIR)/drm/ XF86_NOUVEAU_PATH = $(SRCDIR)/$(CURDIR)/xf86-video-nouveau/ NOUVEAU_HIDD_SOURCES := \ - nouveauclass \ + nouveau_hiddclass \ nouveau_init \ - nouveaubitmapclass \ - nouveaugalliumclass \ + nouveau_bitmapclass \ + nouveau_galliumclass \ nouveau_accel \ - nouveaui2c \ + nouveau_i2cclass \ arosc_emul \ - compositorclass \ + nouveau_compositorclass \ $(addprefix $(DRM_PATH),$(AROS_DRM_CORE_SOURCES)) \ $(addprefix $(DRM_PATH),$(AROS_DRM_NVIDIA_SOURCES)) \ $(addprefix $(DRM_PATH),$(AROS_LIBDRM_CORE_SOURCES)) \ diff --git a/workbench/hidds/nouveau/nouveau.conf b/workbench/hidds/nouveau/nouveau.conf index 58e5cb5d56..328242c0fa 100644 --- a/workbench/hidds/nouveau/nouveau.conf +++ b/workbench/hidds/nouveau/nouveau.conf @@ -1,5 +1,5 @@ ##begin config -version 42.25 +version 45.0 options noexpunge basename Nouveau libbasetype struct IntHIDDNouveauBase @@ -11,7 +11,7 @@ classdatatype struct HIDDNouveauData ##begin cdefprivate #include "nouveau_intern.h" -#include "compositor_intern.h" +#include "nouveau_compositor.h" ##end cdefprivate ##begin methodlist diff --git a/workbench/hidds/nouveau/nouveaubitmapclass.c b/workbench/hidds/nouveau/nouveau_bitmapclass.c similarity index 99% rename from workbench/hidds/nouveau/nouveaubitmapclass.c rename to workbench/hidds/nouveau/nouveau_bitmapclass.c index 42b167f11e..3d6b46c385 100644 --- a/workbench/hidds/nouveau/nouveaubitmapclass.c +++ b/workbench/hidds/nouveau/nouveau_bitmapclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/nouveau/compositor_intern.h b/workbench/hidds/nouveau/nouveau_compositor.h similarity index 97% rename from workbench/hidds/nouveau/compositor_intern.h rename to workbench/hidds/nouveau/nouveau_compositor.h index 233b59abad..f5e14a0a3b 100644 --- a/workbench/hidds/nouveau/compositor_intern.h +++ b/workbench/hidds/nouveau/nouveau_compositor.h @@ -1,7 +1,7 @@ #ifndef _COMPOSITOR_INTERN_H #define _COMPOSITOR_INTERN_H /* - Copyright © 2010-2013, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/nouveau/compositorclass.c b/workbench/hidds/nouveau/nouveau_compositorclass.c similarity index 99% rename from workbench/hidds/nouveau/compositorclass.c rename to workbench/hidds/nouveau/nouveau_compositorclass.c index 60d0010f5b..1347fc5d4c 100644 --- a/workbench/hidds/nouveau/compositorclass.c +++ b/workbench/hidds/nouveau/nouveau_compositorclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -17,7 +17,7 @@ #include "nouveau_intern.h" /* Non generic part */ -#include "compositor_intern.h" +#include "nouveau_compositor.h" #include #include diff --git a/workbench/hidds/nouveau/nouveaugalliumclass.c b/workbench/hidds/nouveau/nouveau_galliumclass.c similarity index 99% rename from workbench/hidds/nouveau/nouveaugalliumclass.c rename to workbench/hidds/nouveau/nouveau_galliumclass.c index 1e86d8712f..fb1fc7d7df 100644 --- a/workbench/hidds/nouveau/nouveaugalliumclass.c +++ b/workbench/hidds/nouveau/nouveau_galliumclass.c @@ -1,5 +1,5 @@ /* - Copyright 2010-2011, The AROS Development Team. All rights reserved. + Copyright 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/nouveau/nouveauclass.c b/workbench/hidds/nouveau/nouveau_hiddclass.c similarity index 99% rename from workbench/hidds/nouveau/nouveauclass.c rename to workbench/hidds/nouveau/nouveau_hiddclass.c index 144c80d764..9b8cb0e343 100644 --- a/workbench/hidds/nouveau/nouveauclass.c +++ b/workbench/hidds/nouveau/nouveau_hiddclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/nouveau/nouveaui2c.c b/workbench/hidds/nouveau/nouveau_i2cclass.c similarity index 95% rename from workbench/hidds/nouveau/nouveaui2c.c rename to workbench/hidds/nouveau/nouveau_i2cclass.c index 2e1f0e7965..d0b254ee24 100644 --- a/workbench/hidds/nouveau/nouveaui2c.c +++ b/workbench/hidds/nouveau/nouveau_i2cclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2010, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/nouveau/nouveau_intern.h b/workbench/hidds/nouveau/nouveau_intern.h index fbb73bfdc9..91ec9ea72e 100644 --- a/workbench/hidds/nouveau/nouveau_intern.h +++ b/workbench/hidds/nouveau/nouveau_intern.h @@ -1,11 +1,11 @@ #ifndef _NOUVEAU_INTERN_H #define _NOUVEAU_INTERN_H /* - Copyright © 2010-2015, The AROS Development Team. All rights reserved. + Copyright © 2010-2017, The AROS Development Team. All rights reserved. $Id$ */ -#include +#include #include #include diff --git a/workbench/hidds/nvidia/nv.h b/workbench/hidds/nvidia/nv.h index 947b269be4..4e9be0eed9 100644 --- a/workbench/hidds/nvidia/nv.h +++ b/workbench/hidds/nvidia/nv.h @@ -1,7 +1,7 @@ #ifndef _NV_H #define _NV_H /* - Copyright © 2004-2015, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: private header file @@ -20,7 +20,7 @@ #include #include -#include +#include #include "nv_local.h" #include "riva_hw.h" diff --git a/workbench/hidds/nvidia/nvhardware.c b/workbench/hidds/nvidia/nvhardware.c index 0e1ac06ba1..cb3c7ede80 100644 --- a/workbench/hidds/nvidia/nvhardware.c +++ b/workbench/hidds/nvidia/nvhardware.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2006, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: nvidia.hidd initialization @@ -65,7 +65,7 @@ #include #include -#include +#include #define DEBUG 0 #include diff --git a/workbench/hidds/nvidia/nvidia.conf b/workbench/hidds/nvidia/nvidia.conf index 914d0111c3..fbea53bd68 100644 --- a/workbench/hidds/nvidia/nvidia.conf +++ b/workbench/hidds/nvidia/nvidia.conf @@ -1,6 +1,6 @@ ##begin config basename NV -version 42.1 +version 45.0 libbasetype struct nvbase classptr_field sd.nvclass classid CLID_Hidd_Gfx_nVidia diff --git a/workbench/hidds/nvidia/nvidia_init.c b/workbench/hidds/nvidia/nvidia_init.c index 6972d63758..e2361cdef6 100644 --- a/workbench/hidds/nvidia/nvidia_init.c +++ b/workbench/hidds/nvidia/nvidia_init.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2015, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: nvidia.hidd initialization @@ -69,7 +69,7 @@ #include #include -#include +#include #include diff --git a/workbench/hidds/nvidia/nvidiabitmap.c b/workbench/hidds/nvidia/nvidiabitmap.c index cf2bfe6201..eb5c282270 100644 --- a/workbench/hidds/nvidia/nvidiabitmap.c +++ b/workbench/hidds/nvidia/nvidiabitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2010, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: NVidia bitmap class @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/workbench/hidds/nvidia/nvidiaclass.c b/workbench/hidds/nvidia/nvidiaclass.c index feb77978b9..53ee017a4b 100644 --- a/workbench/hidds/nvidia/nvidiaclass.c +++ b/workbench/hidds/nvidia/nvidiaclass.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2015, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: NVidia gfx class @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/workbench/hidds/nvidia/planarbm.c b/workbench/hidds/nvidia/planarbm.c index f8a198b232..3d9996d225 100644 --- a/workbench/hidds/nvidia/planarbm.c +++ b/workbench/hidds/nvidia/planarbm.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics planar bitmap class implementation. @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/workbench/hidds/radeon/ati.h b/workbench/hidds/radeon/ati.h index d65dbf8634..6a36e017da 100644 --- a/workbench/hidds/radeon/ati.h +++ b/workbench/hidds/radeon/ati.h @@ -2,7 +2,7 @@ #define _ATI_H /* - Copyright � 2004-2015, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/workbench/hidds/radeon/ati_bitmap.c b/workbench/hidds/radeon/ati_bitmap.c index f39ff48835..cf6381a366 100644 --- a/workbench/hidds/radeon/ati_bitmap.c +++ b/workbench/hidds/radeon/ati_bitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 2004, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -11,7 +11,7 @@ #include "radeon_macros.h" #include -#include +#include #include #include diff --git a/workbench/hidds/radeon/ati_class.c b/workbench/hidds/radeon/ati_class.c index b4596650e3..9e00bc62db 100644 --- a/workbench/hidds/radeon/ati_class.c +++ b/workbench/hidds/radeon/ati_class.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2015, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -166,7 +166,7 @@ OOP_Object *METHOD(ATI, Hidd_Gfx, CreateObject) - aHidd_BitMap_ModeID: a modeid. create a nondisplayable bitmap with the size and pixelformat of a gfxmode. - aHidd_BitMap_StdPixFmt: a standard pixelformat as described in - hidd/graphics.h + hidd/gfx.h - aHidd_BitMap_Friend: if this is supplied and none of the two above are supplied, then the pixel format of the created bitmap will be the same as the one of the friend bitmap. diff --git a/workbench/hidds/radeon/ati_i2c.c b/workbench/hidds/radeon/ati_i2c.c index 071bfc2e08..7d5bdedb1e 100644 --- a/workbench/hidds/radeon/ati_i2c.c +++ b/workbench/hidds/radeon/ati_i2c.c @@ -1,5 +1,5 @@ /* - Copyright © 2004, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/radeon/ati_init.c b/workbench/hidds/radeon/ati_init.c index c5e860110b..c88625491c 100644 --- a/workbench/hidds/radeon/ati_init.c +++ b/workbench/hidds/radeon/ati_init.c @@ -1,5 +1,5 @@ /* - Copyright © 2003-2015, The AROS Development Team. All rights reserved. + Copyright © 2003-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -24,7 +24,7 @@ #include #include -#include +#include #include "ati.h" #include "ids.h" @@ -339,4 +339,4 @@ static int ATI_Expunge(LIBBASETYPEPTR LIBBASE) ADD2INITLIB(ATI_Init, 0) ADD2EXPUNGELIB(ATI_Expunge, 0) -ADD2LIBS((STRPTR)"graphics.hidd", 0, static struct Library *, __gfxbase); +ADD2LIBS((STRPTR)"gfx.hidd", 0, static struct Library *, __gfxbase); diff --git a/workbench/hidds/radeon/bitmap.c b/workbench/hidds/radeon/bitmap.c index 37a42c15e0..788c713feb 100644 --- a/workbench/hidds/radeon/bitmap.c +++ b/workbench/hidds/radeon/bitmap.c @@ -1,5 +1,5 @@ /* - Copyright � 2003-2007, The AROS Development Team. All rights reserved. + Copyright © 2003-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/radeon/planarbm.c b/workbench/hidds/radeon/planarbm.c index c43f51dcca..750b22e8a2 100644 --- a/workbench/hidds/radeon/planarbm.c +++ b/workbench/hidds/radeon/planarbm.c @@ -1,5 +1,5 @@ /* - Copyright � 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Graphics planar bitmap class implementation. @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/workbench/hidds/radeon/radeon.conf b/workbench/hidds/radeon/radeon.conf index 323fcd9c09..b453e55fb5 100644 --- a/workbench/hidds/radeon/radeon.conf +++ b/workbench/hidds/radeon/radeon.conf @@ -1,6 +1,6 @@ ##begin config basename ATI -version 42.1 +version 45.0 libbasetype struct atibase classptr_field sd.AtiClass classid CLID_Hidd_Gfx_Ati diff --git a/workbench/hidds/radeon/radeon_accel.c b/workbench/hidds/radeon/radeon_accel.c index 080ee9c11f..a03d0850f1 100644 --- a/workbench/hidds/radeon/radeon_accel.c +++ b/workbench/hidds/radeon/radeon_accel.c @@ -1,5 +1,5 @@ /* - Copyright © 2004, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/radeon/radeon_bios.c b/workbench/hidds/radeon/radeon_bios.c index e805e8443e..42de3c0f0c 100644 --- a/workbench/hidds/radeon/radeon_bios.c +++ b/workbench/hidds/radeon/radeon_bios.c @@ -1,5 +1,5 @@ /* - Copyright © 2004-2007, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ Desc: ATI radeon driver. BIOS part. @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/workbench/hidds/radeon/radeon_driver.c b/workbench/hidds/radeon/radeon_driver.c index 83c45e05c2..7a41879757 100644 --- a/workbench/hidds/radeon/radeon_driver.c +++ b/workbench/hidds/radeon/radeon_driver.c @@ -1,5 +1,5 @@ /* - Copyright © 2004, The AROS Development Team. All rights reserved. + Copyright © 2004-2017, The AROS Development Team. All rights reserved. $Id$ */ diff --git a/workbench/hidds/sm502/mmakefile.src b/workbench/hidds/sm502/mmakefile.src index eea0878e4b..412c31c99d 100644 --- a/workbench/hidds/sm502/mmakefile.src +++ b/workbench/hidds/sm502/mmakefile.src @@ -2,17 +2,18 @@ include $(SRCDIR)/config/aros.cfg +#MM hidd-sm502gfx : kernel-hidd-gfx-includes + USER_LDFLAGS := -static FILES := \ - sm502_init \ - sm502gfxclass \ - hardware \ - bitmap + sm502gfx_init \ + sm502gfx_hiddclass \ + sm502gfx_support \ + sm502gfx_bitmapclass -#MM- workbench-hidds: hidd-sm502 -#MM- hidd-sm502-includes: kernel-hidd-pci-includes +#MM- hidd-sm502gfx-includes: kernel-hidd-pci-includes -%build_module mmake=hidd-sm502 \ - modname=sm502 modtype=hidd \ +%build_module mmake=hidd-sm502gfx \ + modname=sm502gfx modtype=hidd \ files=$(FILES) diff --git a/workbench/hidds/sm502/sm502.conf b/workbench/hidds/sm502/sm502gfx.conf similarity index 77% rename from workbench/hidds/sm502/sm502.conf rename to workbench/hidds/sm502/sm502gfx.conf index ae2cc23fa0..ee55d39f16 100644 --- a/workbench/hidds/sm502/sm502.conf +++ b/workbench/hidds/sm502/sm502gfx.conf @@ -1,17 +1,17 @@ ##begin config -basename SM502 +basename SM502Gfx libbasetype struct SM502GfxBase -version 42.2 +version 45.0 residentpri 9 classptr_field vsd.sm502gfxclass classdatatype struct SM502Gfx_data -classid CLID_Hidd_SM502Gfx +classid CLID_Hidd_Gfx_SM502 superclass CLID_Hidd_Gfx ##end config ##begin cdefprivate -#include "sm502gfxclass.h" -#include "bitmap.h" +#include "sm502gfx_hidd.h" +#include "sm502gfx_bitmap.h" ##end cdefprivate ##begin methodlist @@ -31,7 +31,7 @@ basename SM502BM type hidd classptr_field vsd.bmclass superclass CLID_Hidd_ChunkyBM -classdatatype struct BitmapData +classdatatype struct SM502GfxBitmapData ##end config ##begin methodlist diff --git a/rom/hidds/vesa/bitmap.h b/workbench/hidds/sm502/sm502gfx_bitmap.h similarity index 80% rename from rom/hidds/vesa/bitmap.h rename to workbench/hidds/sm502/sm502gfx_bitmap.h index 50b25c48f6..939c076f9b 100644 --- a/rom/hidds/vesa/bitmap.h +++ b/workbench/hidds/sm502/sm502gfx_bitmap.h @@ -1,19 +1,19 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ -#ifndef _BITMAP_H -#define _BITMAP_H +#ifndef SM502GFX_BITMAP_H +#define SM502GFX_BITMAP_H -#include +#include #define IS_BM_ATTR(attr, idx) ( ( (idx) = (attr) - HiddBitMapAttrBase) < num_Hidd_BitMap_Attrs) /* This structure is used as instance data for the bitmap class. */ -struct BitmapData +struct SM502GfxBitmapData { UBYTE *VideoData; /* Pointing to video data */ LONG width; /* Bitmap size */ @@ -31,4 +31,4 @@ struct BitmapData LONG yoffset; }; -#endif /* _BITMAP_H */ +#endif /* SM502GFX_BITMAP_H */ diff --git a/workbench/hidds/sm502/bitmap.c b/workbench/hidds/sm502/sm502gfx_bitmapclass.c similarity index 82% rename from workbench/hidds/sm502/bitmap.c rename to workbench/hidds/sm502/sm502gfx_bitmapclass.c index c820a668a6..fa28cd17dd 100644 --- a/workbench/hidds/sm502/bitmap.c +++ b/workbench/hidds/sm502/sm502gfx_bitmapclass.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Bitmap class for SM502 hidd. + Desc: Bitmap class for SM502 Gfx Hidd. Lang: English. */ @@ -15,15 +15,15 @@ #include #include #include -#include +#include #include #include #include #include -#include "bitmap.h" -#include "sm502gfxclass.h" +#include "sm502gfx_bitmap.h" +#include "sm502gfx_hidd.h" #include LC_LIBDEFS_FILE @@ -39,7 +39,7 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) if (o) { OOP_MethodID disp_mid; - struct BitmapData *data; + struct SM502GfxBitmapData *data; HIDDT_ModeID modeid; OOP_Object *sync, *pf; @@ -60,15 +60,15 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) data->disp_width = OOP_GET(sync, aHidd_Sync_HDisp); data->disp_height = OOP_GET(sync, aHidd_Sync_VDisp); - D(bug("[SM502BitMap] Bitmap %ld x % ld, %u bytes per pixel, %u bytes per line\n", + D(bug("[SM502Gfx:BitMap] Bitmap %ld x % ld, %u bytes per pixel, %u bytes per line\n", data->width, data->height, data->bytesperpix, data->bytesperline)); - D(bug("[SM502BitMap] Video data at 0x%p (%u bytes)\n", data->VideoData, data->bytesperline * data->height)); + D(bug("[SM502Gfx:BitMap] Video data at 0x%p (%u bytes)\n", data->VideoData, data->bytesperline * data->height)); if (OOP_GET(data->pixfmtobj, aHidd_PixFmt_ColorModel) != vHidd_ColorModel_Palette) ReturnPtr("SM502Gfx.BitMap::New()", OOP_Object *, o); data->DAC = AllocMem(768, MEMF_ANY); - D(bug("[SM502BitMap] Palette data at 0x%p\n", data->DAC)); + D(bug("[SM502Gfx:BitMap] Palette data at 0x%p\n", data->DAC)); if (data->DAC) ReturnPtr("SM502Gfx.BitMap::New()", OOP_Object *, o); @@ -84,9 +84,9 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) /********** Bitmap::Dispose() ***********************************/ VOID MNAME_ROOT(Dispose)(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct SM502GfxBitmapData *data = OOP_INST_DATA(cl, o); - D(bug("[SM502BitMap] Dispose(0x%p)\n", o)); + D(bug("[SM502Gfx:BitMap] Dispose(0x%p)\n", o)); if (data->DAC) FreeMem(data->DAC, 768); @@ -100,7 +100,7 @@ VOID MNAME_ROOT(Dispose)(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) VOID MNAME_ROOT(Get)(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct SM502GfxBitmapData *data = OOP_INST_DATA(cl, o); ULONG idx; if (IS_BM_ATTR(msg->attrID, idx)) @@ -127,7 +127,7 @@ VOID MNAME_ROOT(Get)(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct SM502GfxBitmapData *data = OOP_INST_DATA(cl, o); struct TagItem *tag, *tstate; ULONG idx; LONG xoffset = data->xoffset; @@ -142,7 +142,7 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) switch(idx) { case aoHidd_BitMap_Visible: - D(bug("[SM502BitMap] Setting Visible to %d\n", tag->ti_Data)); + D(bug("[SM502Gfx:BitMap] Setting Visible to %d\n", tag->ti_Data)); data->disp = tag->ti_Data; if (data->disp) { if (data->DAC) @@ -176,7 +176,7 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) if ((xoffset != data->xoffset) || (yoffset != data->yoffset)) { - D(bug("[SM502BitMap] Scroll to (%d, %d)\n", xoffset, yoffset)); + D(bug("[SM502Gfx:BitMap] Scroll to (%d, %d)\n", xoffset, yoffset)); data->xoffset = xoffset; data->yoffset = yoffset; @@ -195,16 +195,16 @@ VOID MNAME_ROOT(Set)(OOP_Class *cl, OOP_Object *o, struct pRoot_Set *msg) BOOL MNAME_BM(SetColors)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetColors *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct SM502GfxBitmapData *data = OOP_INST_DATA(cl, o); struct SM502_HWData *hwdata = &XSD(cl)->data; ULONG xc_i, col_i; UBYTE p_shift; UWORD red, green, blue; - D(bug("[SM502BitMap] SetColors(%u, %u)\n", msg->firstColor, msg->numColors)); + D(bug("[SM502Gfx:BitMap] SetColors(%u, %u)\n", msg->firstColor, msg->numColors)); if (!OOP_DoSuperMethod(cl, o, (OOP_Msg)msg)) { - D(bug("[SM502BitMap] DoSuperMethod() failed\n")); + D(bug("[SM502Gfx:BitMap] DoSuperMethod() failed\n")); return FALSE; } @@ -235,9 +235,9 @@ BOOL MNAME_BM(SetColors)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_SetCo VOID MNAME_BM(UpdateRect)(OOP_Class *cl, OOP_Object *o, struct pHidd_BitMap_UpdateRect *msg) { - struct BitmapData *data = OOP_INST_DATA(cl, o); + struct SM502GfxBitmapData *data = OOP_INST_DATA(cl, o); - D(bug("[SM502BitMap] UpdateRect(%d, %d, %d, %d), bitmap 0x%p\n", msg->x, msg->y, msg->width, msg->height, o)); + D(bug("[SM502Gfx:BitMap] UpdateRect(%d, %d, %d, %d), bitmap 0x%p\n", msg->x, msg->y, msg->width, msg->height, o)); if (data->disp) { LOCK_FRAMEBUFFER(XSD(cl)); sm502DoRefreshArea(&XSD(cl)->data, data, msg->x, msg->y, msg->x + msg->width, msg->y + msg->height); diff --git a/workbench/hidds/sm502/mouse.h b/workbench/hidds/sm502/sm502gfx_cursor.h similarity index 54% rename from workbench/hidds/sm502/mouse.h rename to workbench/hidds/sm502/sm502gfx_cursor.h index 4d62b0467f..2b9f696e64 100644 --- a/workbench/hidds/sm502/mouse.h +++ b/workbench/hidds/sm502/sm502gfx_cursor.h @@ -1,7 +1,7 @@ -#ifndef MOUSE_H -#define MOUSE_H +#ifndef SM502GFX_CURSOR_H +#define SM502GFX_CURSOR_H -#include +#include struct MouseData { APTR shape; @@ -13,4 +13,4 @@ struct MouseData { LONG visible; }; -#endif +#endif /* SM502GFX_CURSOR_H */ diff --git a/workbench/hidds/sm502/sm502gfxclass.h b/workbench/hidds/sm502/sm502gfx_hidd.h similarity index 86% rename from workbench/hidds/sm502/sm502gfxclass.h rename to workbench/hidds/sm502/sm502gfx_hidd.h index 03358644d0..5f38b211dc 100644 --- a/workbench/hidds/sm502/sm502gfxclass.h +++ b/workbench/hidds/sm502/sm502gfx_hidd.h @@ -1,8 +1,8 @@ -#ifndef HIDD_SM502GFXCLASS_H -#define HIDD_SM502GFXCLASS_H +#ifndef SM502GFX_HIDD_H +#define SM502GFX_HIDD_H /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Some SM502Gfx useful data. @@ -15,10 +15,10 @@ #include #include -#include "bitmap.h" -#include "hardware.h" +#include "sm502gfx_bitmap.h" +#include "sm502gfx_support.h" -#define CLID_Hidd_SM502Gfx "hidd.gfx.sm502" +#define CLID_Hidd_Gfx_SM502 "hidd.gfx.sm502" struct SM502Gfx_data { @@ -67,4 +67,4 @@ struct SM502GfxBase #define HiddSyncAttrBase XSD(cl)->attrBases[4] #define HiddAttrBase XSD(cl)->attrBases[5] -#endif /* HIDD_SM502GFXCLASS_H */ +#endif /* SM502GFX_HIDD_H */ diff --git a/workbench/hidds/sm502/sm502gfxclass.c b/workbench/hidds/sm502/sm502gfx_hiddclass.c similarity index 89% rename from workbench/hidds/sm502/sm502gfxclass.c rename to workbench/hidds/sm502/sm502gfx_hiddclass.c index e16179e715..bd8d9abc2d 100644 --- a/workbench/hidds/sm502/sm502gfxclass.c +++ b/workbench/hidds/sm502/sm502gfx_hiddclass.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: Class for SM502. + Desc: Gfx Hidd class for SM502. Lang: English. */ @@ -20,14 +20,14 @@ #include #include #include -#include +#include #include #include #include -#include "sm502gfxclass.h" -#include "bitmap.h" -#include "hardware.h" +#include "sm502gfx_hidd.h" +#include "sm502gfx_bitmap.h" +#include "sm502gfx_support.h" #include LC_LIBDEFS_FILE @@ -42,7 +42,7 @@ static AROS_INTH1(ResetHandler, struct SM502_HWData *, hwdata) AROS_INTFUNC_EXIT } -OOP_Object *SM502__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) +OOP_Object *SM502Gfx__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) { struct TagItem pftags[] = { @@ -116,7 +116,7 @@ OOP_Object *SM502__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg { struct SM502Gfx_data *data = OOP_INST_DATA(cl, o); - D(bug("Got object from super\n")); + D(bug("[SM502] Got object from super\n")); XSD(cl)->sm502gfxhidd = o; data->ResetInterrupt.is_Code = (APTR)ResetHandler; @@ -126,7 +126,7 @@ OOP_Object *SM502__Root__New(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg ReturnPtr("SM502Gfx::New", OOP_Object *, o); } -VOID SM502__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) +VOID SM502Gfx__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) { struct SM502Gfx_data *data = OOP_INST_DATA(cl, o); @@ -135,7 +135,7 @@ VOID SM502__Root__Dispose(OOP_Class *cl, OOP_Object *o, OOP_Msg msg) XSD(cl)->sm502gfxhidd = NULL; } -VOID SM502__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) +VOID SM502Gfx__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) { ULONG idx; @@ -151,7 +151,7 @@ VOID SM502__Root__Get(OOP_Class *cl, OOP_Object *o, struct pRoot_Get *msg) OOP_DoSuperMethod(cl, o, (OOP_Msg)msg); } -OOP_Object *SM502__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) +OOP_Object *SM502Gfx__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_CreateObject *msg) { OOP_Object *object = NULL; @@ -200,7 +200,7 @@ OOP_Object *SM502__Hidd_Gfx__CreateObject(OOP_Class *cl, OOP_Object *o, struct p /********* GfxHidd::Show() ***************************/ -OOP_Object *SM502__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) +OOP_Object *SM502Gfx__Hidd_Gfx__Show(OOP_Class *cl, OOP_Object *o, struct pHidd_Gfx_Show *msg) { struct SM502Gfx_staticdata *data = XSD(cl); struct TagItem tags[] = { diff --git a/workbench/hidds/sm502/sm502_init.c b/workbench/hidds/sm502/sm502gfx_init.c similarity index 84% rename from workbench/hidds/sm502/sm502_init.c rename to workbench/hidds/sm502/sm502gfx_init.c index 4b4f3d8050..139d5de728 100644 --- a/workbench/hidds/sm502/sm502_init.c +++ b/workbench/hidds/sm502/sm502gfx_init.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: sm502 gfx Hidd for standalone i386 AROS + Desc: sm502 Gfx Hidd for standalone i386 AROS Lang: english */ @@ -17,13 +17,13 @@ #include #include #include -#include +#include #include #include #include -#include "hardware.h" -#include "sm502gfxclass.h" +#include "sm502gfx_support.h" +#include "sm502gfx_hidd.h" #include LC_LIBDEFS_FILE @@ -70,7 +70,7 @@ static const STRPTR interfaces[ATTRBASES_NUM] = IID_Hidd }; -static int PCSM502_Init(LIBBASETYPEPTR LIBBASE) +static int SM502Gfx_Init(LIBBASETYPEPTR LIBBASE) { struct SM502Gfx_staticdata *xsd = &LIBBASE->vsd; struct GfxBase *GfxBase; @@ -86,7 +86,7 @@ static int PCSM502_Init(LIBBASETYPEPTR LIBBASE) if (!initSM502GfxHW(&xsd->data)) return FALSE; - D(bug("[SM502] Init: Everything OK, installing driver\n")); + D(bug("[SM502Gfx] Init: Everything OK, installing driver\n")); /* * Open graphics.library ourselves because we will close it @@ -96,7 +96,7 @@ static int PCSM502_Init(LIBBASETYPEPTR LIBBASE) GfxBase = (struct GfxBase *)OpenLibrary("graphics.library", 41); if (!GfxBase) { - D(bug("[SM502] Failed to open graphics.library!\n")); + D(bug("[SM502Gfx] Failed to open graphics.library!\n")); return FALSE; } @@ -112,7 +112,7 @@ static int PCSM502_Init(LIBBASETYPEPTR LIBBASE) */ err = AddDisplayDriver(LIBBASE->vsd.sm502gfxclass, NULL, DDRV_BootMode, TRUE, TAG_DONE); - D(bug("[SM502] AddDisplayDriver() result: %u\n", err)); + D(bug("[SM502Gfx] AddDisplayDriver() result: %u\n", err)); if (!err) { /* We use ourselves, and no one else does */ @@ -124,4 +124,4 @@ static int PCSM502_Init(LIBBASETYPEPTR LIBBASE) return res; } -ADD2INITLIB(PCSM502_Init, 0) +ADD2INITLIB(SM502Gfx_Init, 0) diff --git a/workbench/hidds/sm502/hardware.c b/workbench/hidds/sm502/sm502gfx_support.c similarity index 86% rename from workbench/hidds/sm502/hardware.c rename to workbench/hidds/sm502/sm502gfx_support.c index 5f6d176b4e..78aa706ebe 100644 --- a/workbench/hidds/sm502/hardware.c +++ b/workbench/hidds/sm502/sm502gfx_support.c @@ -1,8 +1,8 @@ /* - Copyright © 1995-2011, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ - Desc: sm502 "hardware" functions + Desc: sm502 hardware support functions Lang: English */ @@ -19,9 +19,9 @@ #include #include -#include "bitmap.h" -#include "sm502gfxclass.h" -#include "hardware.h" +#include "sm502gfx_bitmap.h" +#include "sm502gfx_hidd.h" +#include "sm502gfx_support.h" #include @@ -41,7 +41,7 @@ BOOL initSM502GfxHW(struct SM502_HWData *hw) /* Find the first device */ if (!Find_PCI_Card(hw)) { - D(bug("[SM502] No card found\n")); + D(bug("[SM502Gfx] No card found\n")); return FALSE; } @@ -89,22 +89,22 @@ BOOL initSM502GfxHW(struct SM502_HWData *hw) hw->height = hw->disp_height - hw->yoffset; hw->palettewidth = (hw->depth == 8) ? 256 : 0; - D(bug("[SM502] HwInit: Clearing %d kB of framebuffer at 0x%08x", + D(bug("[SM502Gfx] HwInit: Clearing %d kB of framebuffer at 0x%08x", hw->height * hw->bytesperline >> 10, hw->framebuffer)); ClearBuffer(hw); - D(bug("[SM502] HwInit: Linear framebuffer at 0x%08x\n",hw->framebuffer)); - D(bug("[SM502] HwInit: Screenmode %dx%dx%d\n",hw->width,hw->height,hw->depth)); - D(bug("[SM502] HwInit: Masks R %08x<<%2d G %08x<<%2d B %08x<<%2d\n", + D(bug("[SM502Gfx] HwInit: Linear framebuffer at 0x%08x\n",hw->framebuffer)); + D(bug("[SM502Gfx] HwInit: Screenmode %dx%dx%d\n",hw->width,hw->height,hw->depth)); + D(bug("[SM502Gfx] HwInit: Masks R %08x<<%2d G %08x<<%2d B %08x<<%2d\n", hw->redmask, hw->redshift, hw->greenmask, hw->greenshift, hw->bluemask, hw->blueshift)); - D(bug("[SM502] HwInit: PaletteWidth %d\n", hw->palettewidth)); - D(bug("[sm502] HwInit: BytesPerPixel %d\n", hw->bytesperpixel)); + D(bug("[SM502Gfx] HwInit: PaletteWidth %d\n", hw->palettewidth)); + D(bug("[SM502Gfx] HwInit: BytesPerPixel %d\n", hw->bytesperpixel)); return TRUE; } -void sm502DoRefreshArea(struct SM502_HWData *hwdata, struct BitmapData *data, +void sm502DoRefreshArea(struct SM502_HWData *hwdata, struct SM502GfxBitmapData *data, LONG x1, LONG y1, LONG x2, LONG y2) { UBYTE *src, *dst; @@ -190,7 +190,7 @@ AROS_UFH3(void, Enumerator, struct pHidd_PCIDriver_MapPCI mappci,*msg = &mappci; struct SM502_HWData *sd = hook->h_Data; - D(bug("[SM502] Enumerator: Found device\n")); + D(bug("[SM502Gfx] Enumerator: Found device\n")); OOP_GetAttr(pciDevice, aHidd_PCIDevice_Driver, (APTR)&driver); OOP_GetAttr(pciDevice, aHidd_PCIDevice_VendorID, &Vendor); @@ -203,7 +203,7 @@ AROS_UFH3(void, Enumerator, mappci.Length = size; sd->framebuffer = (APTR)OOP_DoMethod(driver, (OOP_Msg)msg); - D(bug("[SM502] Got framebuffer @ %x (size=%x)\n", sd->framebuffer, size)); + D(bug("[SM502Gfx] Got framebuffer @ %x (size=%x)\n", sd->framebuffer, size)); OOP_GetAttr(pciDevice, aHidd_PCIDevice_Base1, (APTR)&buf); OOP_GetAttr(pciDevice, aHidd_PCIDevice_Size1, &size); @@ -213,7 +213,7 @@ AROS_UFH3(void, Enumerator, mappci.Length = size; sd->mmio = (APTR)OOP_DoMethod(driver, (OOP_Msg)msg); - D(bug("[SM502] Got mmio regs @ %x (size=%x)\n", sd->mmio, size)); + D(bug("[SM502Gfx] Got mmio regs @ %x (size=%x)\n", sd->mmio, size)); AROS_USERFUNC_EXIT } @@ -222,7 +222,7 @@ static BOOL Find_PCI_Card(struct SM502_HWData *sd) { OOP_Object *pci; - D(bug("[SM502] Find_PCI_Card\n")); + D(bug("[SM502Gfx] Find_PCI_Card\n")); sd->framebuffer = sd->mmio = NULL; sd->pciDeviceAttrBase = OOP_ObtainAttrBase(IID_Hidd_PCIDevice); @@ -230,7 +230,7 @@ static BOOL Find_PCI_Card(struct SM502_HWData *sd) { pci = OOP_NewObject(NULL, CLID_Hidd_PCI, NULL); - D(bug("[SM502] Creating PCI object\n")); + D(bug("[SM502Gfx] Creating PCI object\n")); if (pci) { @@ -250,7 +250,7 @@ static BOOL Find_PCI_Card(struct SM502_HWData *sd) callback: &FindHook, requirements: (struct TagItem*)&Requirements, }, *msg = &enummsg; - D(bug("[SM502] Calling search Hook\n")); + D(bug("[SM502Gfx] Calling search Hook\n")); OOP_DoMethod(pci, (OOP_Msg)msg); OOP_DisposeObject(pci); } diff --git a/workbench/hidds/sm502/hardware.h b/workbench/hidds/sm502/sm502gfx_support.h similarity index 85% rename from workbench/hidds/sm502/hardware.h rename to workbench/hidds/sm502/sm502gfx_support.h index 194eb78a34..8a6c11e78e 100644 --- a/workbench/hidds/sm502/hardware.h +++ b/workbench/hidds/sm502/sm502gfx_support.h @@ -1,5 +1,5 @@ -#ifndef HARDWARE_H -#define HARDWARE_H +#ifndef SM502GFX_SUPPORT_H +#define SM502GFX_SUPPORT_H #include #include @@ -45,12 +45,12 @@ static inline VOID smwrite(struct SM502_HWData *hw, ULONG reg, ULONG val) #define HiddPCIDeviceAttrBase sd->pciDeviceAttrBase struct SM502Gfx_staticdata; -struct BitmapData; +struct SM502GfxBitmapData; BOOL initSM502GfxHW(struct SM502_HWData *); void DACLoad(struct SM502Gfx_staticdata *, UBYTE *, unsigned char, int); void ClearBuffer(struct SM502_HWData *data); -void sm502DoRefreshArea(struct SM502_HWData *hwdata, struct BitmapData *data, +void sm502DoRefreshArea(struct SM502_HWData *hwdata, struct SM502GfxBitmapData *data, LONG x1, LONG y1, LONG x2, LONG y2); -#endif +#endif /* SM502GFX_SUPPORT_H */ diff --git a/workbench/hidds/vmwaresvga/vmwaresvga.conf b/workbench/hidds/vmwaresvga/vmwaresvga.conf index ba968c253f..95c218e513 100644 --- a/workbench/hidds/vmwaresvga/vmwaresvga.conf +++ b/workbench/hidds/vmwaresvga/vmwaresvga.conf @@ -1,7 +1,7 @@ ##begin config basename VMWareSVGA libbasetype struct VMWareSVGABase -version 42.1 +version 45.0 residentpri 9 classptr_field vsd.vmwaresvgaclass classid CLID_Hidd_VMWareSVGA diff --git a/workbench/hidds/vmwaresvga/vmwaresvga_init.c b/workbench/hidds/vmwaresvga/vmwaresvga_init.c index 79c56ac14c..ac66f3efea 100644 --- a/workbench/hidds/vmwaresvga/vmwaresvga_init.c +++ b/workbench/hidds/vmwaresvga/vmwaresvga_init.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: VMWare SVGA Hidd initialisation code @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/workbench/hidds/vmwaresvga/vmwaresvgabitmap.h b/workbench/hidds/vmwaresvga/vmwaresvgabitmap.h index e75d28651e..b85b184a12 100644 --- a/workbench/hidds/vmwaresvga/vmwaresvgabitmap.h +++ b/workbench/hidds/vmwaresvga/vmwaresvgabitmap.h @@ -1,12 +1,12 @@ /* - Copyright © 1995-2006, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #ifndef _VMWARESVGA_BITMAP_H #define _VMWARESVGA_BITMAP_H -#include +#include #include "vmwaresvgamouse.h" /* This attribute interface is common for both vga onscreen and offscreen bitmap diff --git a/workbench/hidds/vmwaresvga/vmwaresvgaclass.c b/workbench/hidds/vmwaresvga/vmwaresvgaclass.c index 27e5521304..c310cd3238 100644 --- a/workbench/hidds/vmwaresvga/vmwaresvgaclass.c +++ b/workbench/hidds/vmwaresvga/vmwaresvgaclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Class for VMWare. @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/workbench/hidds/vmwaresvga/vmwaresvgamouse.h b/workbench/hidds/vmwaresvga/vmwaresvgamouse.h index 0c33c7bfa8..d1a039f5b3 100644 --- a/workbench/hidds/vmwaresvga/vmwaresvgamouse.h +++ b/workbench/hidds/vmwaresvga/vmwaresvgamouse.h @@ -1,7 +1,7 @@ #ifndef _VMWARESVGA_MOUSE_H #define _VMWARESVGA_MOUSE_H -#include +#include struct MouseData { APTR shape; diff --git a/workbench/hidds/vmwaresvga/vmwaresvgaoffbitmap.c b/workbench/hidds/vmwaresvga/vmwaresvgaoffbitmap.c index 480ee89bd5..c2acdd8f22 100644 --- a/workbench/hidds/vmwaresvga/vmwaresvgaoffbitmap.c +++ b/workbench/hidds/vmwaresvga/vmwaresvgaoffbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Offscreen bitmap class for VMWare hidd. @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "vmwaresvgabitmap.h" diff --git a/workbench/hidds/vmwaresvga/vmwaresvgaonbitmap.c b/workbench/hidds/vmwaresvga/vmwaresvgaonbitmap.c index 513c1ea20a..eddc6492b0 100644 --- a/workbench/hidds/vmwaresvga/vmwaresvgaonbitmap.c +++ b/workbench/hidds/vmwaresvga/vmwaresvgaonbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2006, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Bitmap class for VMWareSVGA hidd. @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "vmwaresvgabitmap.h" diff --git a/workbench/libs/cgfx/alloccmodelisttaglist.c b/workbench/libs/cgfx/alloccmodelisttaglist.c index f17014feb1..ab62cd5cb4 100644 --- a/workbench/libs/cgfx/alloccmodelisttaglist.c +++ b/workbench/libs/cgfx/alloccmodelisttaglist.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/workbench/libs/cgfx/blttemplatealpha.c b/workbench/libs/cgfx/blttemplatealpha.c index 1901c1d923..609821904f 100644 --- a/workbench/libs/cgfx/blttemplatealpha.c +++ b/workbench/libs/cgfx/blttemplatealpha.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/cvideoctrltaglist.c b/workbench/libs/cgfx/cvideoctrltaglist.c index 2b247ab958..9ce4294748 100644 --- a/workbench/libs/cgfx/cvideoctrltaglist.c +++ b/workbench/libs/cgfx/cvideoctrltaglist.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/cybergraphics_init.c b/workbench/libs/cgfx/cybergraphics_init.c index ab77943a05..4b0958ae6d 100644 --- a/workbench/libs/cgfx/cybergraphics_init.c +++ b/workbench/libs/cgfx/cybergraphics_init.c @@ -1,6 +1,11 @@ +/* + Copyright © 1995-2017, The AROS Development Team. All rights reserved. + $Id$ +*/ + #include #include -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/docdrawmethodtaglist.c b/workbench/libs/cgfx/docdrawmethodtaglist.c index 29ae771c66..d957620d9b 100644 --- a/workbench/libs/cgfx/docdrawmethodtaglist.c +++ b/workbench/libs/cgfx/docdrawmethodtaglist.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/extractcolor.c b/workbench/libs/cgfx/extractcolor.c index 627a876baa..f2a9bee6f4 100644 --- a/workbench/libs/cgfx/extractcolor.c +++ b/workbench/libs/cgfx/extractcolor.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/fillpixelarray.c b/workbench/libs/cgfx/fillpixelarray.c index 780532ad44..5565a08f62 100644 --- a/workbench/libs/cgfx/fillpixelarray.c +++ b/workbench/libs/cgfx/fillpixelarray.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/getcyberidattr.c b/workbench/libs/cgfx/getcyberidattr.c index 643aac6681..30913239cf 100644 --- a/workbench/libs/cgfx/getcyberidattr.c +++ b/workbench/libs/cgfx/getcyberidattr.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/getcybermapattr.c b/workbench/libs/cgfx/getcybermapattr.c index 7cf5129a62..5791967b3d 100644 --- a/workbench/libs/cgfx/getcybermapattr.c +++ b/workbench/libs/cgfx/getcybermapattr.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/gfxfuncsupport.h b/workbench/libs/cgfx/gfxfuncsupport.h index 52257dcb56..c5c92b3721 100644 --- a/workbench/libs/cgfx/gfxfuncsupport.h +++ b/workbench/libs/cgfx/gfxfuncsupport.h @@ -1,9 +1,9 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/invertpixelarray.c b/workbench/libs/cgfx/invertpixelarray.c index 86f9ad21f6..d3ebc83ea1 100644 --- a/workbench/libs/cgfx/invertpixelarray.c +++ b/workbench/libs/cgfx/invertpixelarray.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/iscybermodeid.c b/workbench/libs/cgfx/iscybermodeid.c index de1a929986..16caabc2cc 100644 --- a/workbench/libs/cgfx/iscybermodeid.c +++ b/workbench/libs/cgfx/iscybermodeid.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include diff --git a/workbench/libs/cgfx/lockbitmaptaglist.c b/workbench/libs/cgfx/lockbitmaptaglist.c index 27ab2beded..30c3db952a 100644 --- a/workbench/libs/cgfx/lockbitmaptaglist.c +++ b/workbench/libs/cgfx/lockbitmaptaglist.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/movepixelarray.c b/workbench/libs/cgfx/movepixelarray.c index 842c37991d..3f652e86f0 100644 --- a/workbench/libs/cgfx/movepixelarray.c +++ b/workbench/libs/cgfx/movepixelarray.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/processpixelarray_opblur.c b/workbench/libs/cgfx/processpixelarray_opblur.c index fd381acebe..e338d19287 100644 --- a/workbench/libs/cgfx/processpixelarray_opblur.c +++ b/workbench/libs/cgfx/processpixelarray_opblur.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -7,7 +7,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_opbrightness.c b/workbench/libs/cgfx/processpixelarray_opbrightness.c index c6f2c7a75c..eb026c5980 100644 --- a/workbench/libs/cgfx/processpixelarray_opbrightness.c +++ b/workbench/libs/cgfx/processpixelarray_opbrightness.c @@ -1,11 +1,11 @@ /* - Copyright © 2013-2014, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_opcol2grey.c b/workbench/libs/cgfx/processpixelarray_opcol2grey.c index bf4a069fc4..cc7993cdb3 100644 --- a/workbench/libs/cgfx/processpixelarray_opcol2grey.c +++ b/workbench/libs/cgfx/processpixelarray_opcol2grey.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_opgradient.c b/workbench/libs/cgfx/processpixelarray_opgradient.c index 95aa8926f9..9aa51037c1 100644 --- a/workbench/libs/cgfx/processpixelarray_opgradient.c +++ b/workbench/libs/cgfx/processpixelarray_opgradient.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_opnegative.c b/workbench/libs/cgfx/processpixelarray_opnegative.c index f41f2bfec2..eb15992488 100644 --- a/workbench/libs/cgfx/processpixelarray_opnegative.c +++ b/workbench/libs/cgfx/processpixelarray_opnegative.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_opnegative_fade.c b/workbench/libs/cgfx/processpixelarray_opnegative_fade.c index 21a3d7e55c..b7c3bc7ab8 100644 --- a/workbench/libs/cgfx/processpixelarray_opnegative_fade.c +++ b/workbench/libs/cgfx/processpixelarray_opnegative_fade.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_opsetalpha.c b/workbench/libs/cgfx/processpixelarray_opsetalpha.c index 83fcf39c0f..63f27fc9a0 100644 --- a/workbench/libs/cgfx/processpixelarray_opsetalpha.c +++ b/workbench/libs/cgfx/processpixelarray_opsetalpha.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -7,7 +7,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_opshiftrgb.c b/workbench/libs/cgfx/processpixelarray_opshiftrgb.c index b38a4d3c13..fd258957b0 100644 --- a/workbench/libs/cgfx/processpixelarray_opshiftrgb.c +++ b/workbench/libs/cgfx/processpixelarray_opshiftrgb.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_optint.c b/workbench/libs/cgfx/processpixelarray_optint.c index 2f5a0bddcf..85398c7ac8 100644 --- a/workbench/libs/cgfx/processpixelarray_optint.c +++ b/workbench/libs/cgfx/processpixelarray_optint.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/processpixelarray_optint_fade.c b/workbench/libs/cgfx/processpixelarray_optint_fade.c index d712afc84b..d74aa8547b 100644 --- a/workbench/libs/cgfx/processpixelarray_optint_fade.c +++ b/workbench/libs/cgfx/processpixelarray_optint_fade.c @@ -1,5 +1,5 @@ /* - Copyright © 2013, The AROS Development Team. All rights reserved. + Copyright © 2013-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/workbench/libs/cgfx/readpixelarray.c b/workbench/libs/cgfx/readpixelarray.c index 8f6e2be9b4..11c43519b8 100644 --- a/workbench/libs/cgfx/readpixelarray.c +++ b/workbench/libs/cgfx/readpixelarray.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/readrgbpixel.c b/workbench/libs/cgfx/readrgbpixel.c index 17a18bea38..0fceb8ed76 100644 --- a/workbench/libs/cgfx/readrgbpixel.c +++ b/workbench/libs/cgfx/readrgbpixel.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/scalepixelarray.c b/workbench/libs/cgfx/scalepixelarray.c index 1f1c747246..d4f5eb88b2 100644 --- a/workbench/libs/cgfx/scalepixelarray.c +++ b/workbench/libs/cgfx/scalepixelarray.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2015, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/unlockbitmap.c b/workbench/libs/cgfx/unlockbitmap.c index 7a6f143a95..29bcf909f2 100644 --- a/workbench/libs/cgfx/unlockbitmap.c +++ b/workbench/libs/cgfx/unlockbitmap.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/unlockbitmaptaglist.c b/workbench/libs/cgfx/unlockbitmaptaglist.c index 1e97de191f..d5e1c5392c 100644 --- a/workbench/libs/cgfx/unlockbitmaptaglist.c +++ b/workbench/libs/cgfx/unlockbitmaptaglist.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -13,7 +13,7 @@ #include #include -#include +#include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/writelutpixelarray.c b/workbench/libs/cgfx/writelutpixelarray.c index 86ab3f1874..9426e61198 100644 --- a/workbench/libs/cgfx/writelutpixelarray.c +++ b/workbench/libs/cgfx/writelutpixelarray.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -8,7 +8,7 @@ #include #include -#include +#include #include "cybergraphics_intern.h" #include "gfxfuncsupport.h" diff --git a/workbench/libs/cgfx/writepixelarray.c b/workbench/libs/cgfx/writepixelarray.c index 940beec761..5335e70c0d 100644 --- a/workbench/libs/cgfx/writepixelarray.c +++ b/workbench/libs/cgfx/writepixelarray.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/writepixelarrayalpha.c b/workbench/libs/cgfx/writepixelarrayalpha.c index e807d18b3e..b8b8c99a4f 100644 --- a/workbench/libs/cgfx/writepixelarrayalpha.c +++ b/workbench/libs/cgfx/writepixelarrayalpha.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgfx/writergbpixel.c b/workbench/libs/cgfx/writergbpixel.c index 246c24b84e..48a2a93672 100644 --- a/workbench/libs/cgfx/writergbpixel.c +++ b/workbench/libs/cgfx/writergbpixel.c @@ -1,12 +1,12 @@ /* - Copyright © 1995-2013, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ Desc: Lang: english */ -#include +#include #include #include "cybergraphics_intern.h" diff --git a/workbench/libs/cgxvideo/CreateVLayerHandleTagList.c b/workbench/libs/cgxvideo/CreateVLayerHandleTagList.c index 1d4b77da56..a086ad7f5f 100644 --- a/workbench/libs/cgxvideo/CreateVLayerHandleTagList.c +++ b/workbench/libs/cgxvideo/CreateVLayerHandleTagList.c @@ -1,10 +1,10 @@ /* - Copyright © 1995-2010, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include #include #include diff --git a/workbench/libs/cgxvideo/DeleteVLayerHandle.c b/workbench/libs/cgxvideo/DeleteVLayerHandle.c index 88188f59fb..5c9b4750c9 100644 --- a/workbench/libs/cgxvideo/DeleteVLayerHandle.c +++ b/workbench/libs/cgxvideo/DeleteVLayerHandle.c @@ -1,9 +1,9 @@ /* - Copyright © 1995-2010, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include #include "cgxvideo_intern.h" diff --git a/workbench/libs/cgxvideo/cgxvideo_init.c b/workbench/libs/cgxvideo/cgxvideo_init.c index 72f4ac4447..1901546089 100644 --- a/workbench/libs/cgxvideo/cgxvideo_init.c +++ b/workbench/libs/cgxvideo/cgxvideo_init.c @@ -1,5 +1,10 @@ +/* + Copyright © 1995-2017, The AROS Development Team. All rights reserved. + $Id$ +*/ + #include -#include +#include #include #include "cgxvideo_intern.h" diff --git a/workbench/libs/gallium/bltpiperesourcerastport.c b/workbench/libs/gallium/bltpiperesourcerastport.c index e4c114a7fb..356c48e349 100644 --- a/workbench/libs/gallium/bltpiperesourcerastport.c +++ b/workbench/libs/gallium/bltpiperesourcerastport.c @@ -1,10 +1,10 @@ /* - Copyright 2011, The AROS Development Team. All rights reserved. + Copyright © 2011-2017, The AROS Development Team. All rights reserved. $Id$ */ #include -#include +#include #include #include #include diff --git a/workbench/system/SysMon/video.c b/workbench/system/SysMon/video.c index 6e5dfb8893..d6ca41dacb 100644 --- a/workbench/system/SysMon/video.c +++ b/workbench/system/SysMon/video.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2014, The AROS Development Team. All rights reserved. + Copyright © 1995-2017, The AROS Development Team. All rights reserved. $Id$ */ @@ -17,7 +17,7 @@ #include #include -#include +#include struct BitMap * bm = NULL; #undef HiddGfxNouveauAttrBase #undef HiddBitMapAttrBase diff --git a/workbench/tools/SysExplorer/enum_gfx.c b/workbench/tools/SysExplorer/enum_gfx.c index c1763039cb..a54cc0a47c 100644 --- a/workbench/tools/SysExplorer/enum_gfx.c +++ b/workbench/tools/SysExplorer/enum_gfx.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2015, The AROS Development Team. + Copyright (C) 2015-2017, The AROS Development Team. $Id$ */ @@ -19,7 +19,7 @@ #include #include -#include +#include #include "locale.h" #include "classes.h" diff --git a/workbench/tools/SysExplorer/gfx_window_cl.c b/workbench/tools/SysExplorer/gfx_window_cl.c index 4856ebc29e..8cf13dd659 100644 --- a/workbench/tools/SysExplorer/gfx_window_cl.c +++ b/workbench/tools/SysExplorer/gfx_window_cl.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2013, The AROS Development Team. + Copyright (C) 2013-2017, The AROS Development Team. $Id$ */ @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/workbench/tools/SysExplorer/main.c b/workbench/tools/SysExplorer/main.c index 3862a37d47..e8a122af82 100644 --- a/workbench/tools/SysExplorer/main.c +++ b/workbench/tools/SysExplorer/main.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2013, The AROS Development Team. + Copyright (C) 2013-2017, The AROS Development Team. $Id$ */ @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include -- 2.11.4.GIT