Revision: 62121
http://sourceforge.net/p/brlcad/code/62121
Author: starseeker
Date: 2014-08-13 17:06:49 +0000 (Wed, 13 Aug 2014)
Log Message:
-----------
Move magic numbers to bu/magic.h
Modified Paths:
--------------
brlcad/branches/framebuffer-experiment/include/bu/magic.h
brlcad/branches/framebuffer-experiment/include/fb.h
brlcad/branches/framebuffer-experiment/src/libfb/fb_private.h
brlcad/branches/framebuffer-experiment/src/libfb/if_X24.c
brlcad/branches/framebuffer-experiment/src/libfb/if_debug.c
brlcad/branches/framebuffer-experiment/src/libfb/if_disk.c
brlcad/branches/framebuffer-experiment/src/libfb/if_mem.c
brlcad/branches/framebuffer-experiment/src/libfb/if_null.c
brlcad/branches/framebuffer-experiment/src/libfb/if_ogl.c
brlcad/branches/framebuffer-experiment/src/libfb/if_qt.cpp
brlcad/branches/framebuffer-experiment/src/libfb/if_remote.c
brlcad/branches/framebuffer-experiment/src/libfb/if_stack.c
brlcad/branches/framebuffer-experiment/src/libfb/if_tk.c
brlcad/branches/framebuffer-experiment/src/libfb/if_wgl.c
Modified: brlcad/branches/framebuffer-experiment/include/bu/magic.h
===================================================================
--- brlcad/branches/framebuffer-experiment/include/bu/magic.h 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/include/bu/magic.h 2014-08-13
17:06:49 UTC (rev 62121)
@@ -192,6 +192,21 @@
#define GED_CMD_MAGIC 0x65786563 /**< exec */
+/* fb */
+
+#define FB_MAGIC 0xfbfb00fb /**< ???? */
+#define FB_WGL_MAGIC 0x574f4642 /**< WOFB */
+#define FB_OGL_MAGIC 0x584f4642 /**< XOFB */
+#define FB_X24_MAGIC 0x58324642 /**< X2FB */
+#define FB_TK_MAGIC 0x544b4642 /**< TKFB */
+#define FB_QT_MAGIC 0x51544642 /**< QTFB */
+#define FB_DEBUG_MAGIC 0x44424642 /**< DBFB */
+#define FB_DISK_MAGIC 0x44494642 /**< STFB */
+#define FB_STK_MAGIC 0x53544642 /**< STFB */
+#define FB_MEMORY_MAGIC 0x4d454642 /**< MEFB */
+#define FB_REMOTE_MAGIC 0x524d4642 /**< MEFB */
+#define FB_NULL_MAGIC 0x4e554642 /**< NUFB */
+
/* misc */
#define ANIMATE_MAGIC 0x414e4963 /**< ANIc */
@@ -202,7 +217,6 @@
#define DB5_RAW_INTERNAL_MAGIC 0x64357269 /**< d5ri */
#define DBI_MAGIC 0x57204381 /**< W C? */
#define DB_FULL_PATH_MAGIC 0x64626670 /**< dbfp */
-#define FB_MAGIC 0xfbfb00fb /**< ???? */
#define LIGHT_MAGIC 0xdbddbdb7 /**< ???? */
#define MF_MAGIC 0x55968058 /**< U??X */
#define PIXEL_EXT_MAGIC 0x50787400 /**< Pxt */
Modified: brlcad/branches/framebuffer-experiment/include/fb.h
===================================================================
--- brlcad/branches/framebuffer-experiment/include/fb.h 2014-08-13 15:17:29 UTC
(rev 62120)
+++ brlcad/branches/framebuffer-experiment/include/fb.h 2014-08-13 17:06:49 UTC
(rev 62121)
@@ -95,16 +95,6 @@
*/
#define FB_CK_FB(_p) BU_CKMAG(_p, FB_MAGIC, "FB")
-#define FB_WGL_MAGIC 0x574f4642 /**< WOFB */
-#define FB_OGL_MAGIC 0x584f4642 /**< XOFB */
-#define FB_X24_MAGIC 0x58324642 /**< X2FB */
-#define FB_TK_MAGIC 0x544b4642 /**< TKFB */
-#define FB_QT_MAGIC 0x51544642 /**< QTFB */
-#define FB_DEBUG_MAGIC 0x44424642 /**< DBFB */
-#define FB_STK_MAGIC 0x53544642 /**< STFB */
-#define FB_MEMORY_MAGIC 0x4d454642 /**< MEFB */
-#define FB_NULL_MAGIC 0x4e554642 /**< NUFB */
-
__BEGIN_DECLS
/* Library entry points */
Modified: brlcad/branches/framebuffer-experiment/src/libfb/fb_private.h
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/fb_private.h
2014-08-13 15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/fb_private.h
2014-08-13 17:06:49 UTC (rev 62121)
@@ -71,6 +71,7 @@
*/
struct fb_internal {
uint32_t if_magic;
+ uint32_t type_magic;
/* Static information: per device TYPE. */
int (*if_open)(struct fb_internal *ifp, const char *file, int _width, int
_height); /**< @brief open device */
int (*if_open_existing)(struct fb_internal *ifp, int width, int height,
struct fb_platform_specific *fb_p); /**< @brief open
device */
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_X24.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_X24.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_X24.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -3495,6 +3495,7 @@
/* This is the ONLY thing that we normally "export" */
fb X24_interface = {
0, /* magic number slot */
+ FB_X24_MAGIC,
X24_open, /* open device */
X24_open_existing, /* existing device_open */
X24_close_existing, /* existing device_close */
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_debug.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_debug.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_debug.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -361,6 +361,7 @@
/* This is the ONLY thing that we "export" */
fb debug_interface = {
0,
+ FB_DEBUG_MAGIC,
deb_open,
deb_open_existing,
deb_close_existing,
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_disk.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_disk.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_disk.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -357,6 +357,7 @@
fb disk_interface = {
0,
+ FB_DISK_MAGIC,
dsk_open,
dsk_open_existing,
dsk_close_existing,
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_mem.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_mem.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_mem.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -470,6 +470,7 @@
/* This is the ONLY thing that we normally "export" */
fb memory_interface = {
0,
+ FB_MEMORY_MAGIC,
mem_open, /* device_open */
mem_open_existing, /* existing device_open */
mem_close_existing, /* existing device_close */
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_null.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_null.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_null.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -256,6 +256,7 @@
/* This is the ONLY thing that we normally "export" */
fb null_interface = {
0,
+ FB_NULL_MAGIC,
null_open, /* device_open */
null_open_existing, /* existing device_open */
null_close_existing,/* existing device_close */
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_ogl.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_ogl.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_ogl.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -1443,7 +1443,7 @@
HIDDEN void
ogl_put_fbps(struct fb_platform_specific *fbps)
{
- BU_CKMAG(fbps, FB_OGL_MAGIC, "X24 framebuffer");
+ BU_CKMAG(fbps, FB_OGL_MAGIC, "ogl framebuffer");
BU_PUT(fbps->data, struct ogl_fb_info);
BU_PUT(fbps, struct fb_platform_specific);
return;
@@ -2369,6 +2369,7 @@
fb ogl_interface =
{
0, /* magic number slot */
+ FB_OGL_MAGIC,
fb_ogl_open, /* open device */
ogl_open_existing, /* existing device_open */
ogl_close_existing, /* existing device_close */
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_qt.cpp
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_qt.cpp 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_qt.cpp 2014-08-13
17:06:49 UTC (rev 62121)
@@ -1349,6 +1349,7 @@
fb qt_interface = {
0,
+ FB_QT_MAGIC,
qt_open, /* device_open */
qt_open_existing,
qt_close_existing,
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_remote.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_remote.c
2014-08-13 15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_remote.c
2014-08-13 17:06:49 UTC (rev 62121)
@@ -785,6 +785,7 @@
fb remote_interface = {
0,
+ FB_REMOTE_MAGIC,
rem_open,
rem_open_existing,
rem_close_existing,
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_stack.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_stack.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_stack.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -434,6 +434,7 @@
/* This is the ONLY thing that we normally "export" */
fb stk_interface = {
0,
+ FB_STK_MAGIC,
stk_open, /* device_open */
stk_open_existing, /* device_open */
stk_close_existing,
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_tk.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_tk.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_tk.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -580,6 +580,7 @@
/* This is the ONLY thing that we "export" */
fb tk_interface = {
0,
+ FB_TK_MAGIC,
fb_tk_open,
tk_open_existing,
tk_close_existing,
Modified: brlcad/branches/framebuffer-experiment/src/libfb/if_wgl.c
===================================================================
--- brlcad/branches/framebuffer-experiment/src/libfb/if_wgl.c 2014-08-13
15:17:29 UTC (rev 62120)
+++ brlcad/branches/framebuffer-experiment/src/libfb/if_wgl.c 2014-08-13
17:06:49 UTC (rev 62121)
@@ -2102,6 +2102,7 @@
fb wgl_interface =
{
0, /* magic number slot */
+ FB_WGL_MAGIC,
wgl_open, /* open device */
wgl_open_existing,
wgl_close_existing,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
