X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgfx%2Fgfx.h;h=5ac1dc240db1629ceb29db383d211f5848e3231a;hb=84d7581d4e99d656db0064086ecee8d9f30aeba3;hp=a852c54d54318e8d72a6bc9f40a19fb20075038d;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/gfx/gfx.h b/bertos/gfx/gfx.h
index a852c54d..5ac1dc24 100644
--- a/bertos/gfx/gfx.h
+++ b/bertos/gfx/gfx.h
@@ -1,28 +1,64 @@
 /**
  * \file
- * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
  *
+ * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 1999 Bernie Innocenti <bernie@codewiz.org>
  *
- * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \defgroup gfx Graphics routines
+ * \ingroup graphics
+ * \{
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  * \brief General pourpose graphics routines
+ *
+ * $WIZ$ module_name = "gfx"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_gfx.h"
+ * $WIZ$ module_depends = "bitmap", "line", "luBS14"
  */
 
 #ifndef GFX_GFX_H
 #define GFX_GFX_H
 
+#include "cfg/cfg_gfx.h"    /* CONFIG_GFX_* */
 #include <cfg/compiler.h>
-#include <cpu/attr.h>   /* CPU_HARVARD */
 
-#include <appconfig.h> /* CONFIG_GFX_* */
+#include <cpu/attr.h>       /* CPU_HARVARD */
+
+
+#define CONFIG_CHART_TYPE_X uint8_t ///< Type for the chart dataset
+#define CONFIG_CHART_TYPE_Y uint8_t ///< Type for the chart dataset
 
 /**
  * \name Known pixel formats for bitmap representation.
  * \{
+ * $WIZ$ bitmap_format = "BITMAP_FMT_PLANAR_H_MSB", "BITMAP_FMT_PLANAR_V_LSB"
  */
 #define BITMAP_FMT_PLANAR_H_MSB  1  /**< Planar pixels, horizontal bytes, MSB left. */
 #define BITMAP_FMT_PLANAR_V_LSB  2  /**< Planar pixels, vertical bytes, LSB top. */
@@ -153,7 +189,7 @@ typedef struct Image
 	 * Compute the size in bytes of a raster suitable for
 	 * holding a bitmap of \a width x \a height pixels.
 	 */
-	#define RAST_SIZE(width, height) ( ((width) + 7 / 8) * (height) )
+	#define RAST_SIZE(width, height) ( (((width) + 7) / 8) * (height) )
 
 #elif CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_V_LSB
 	/**
@@ -181,7 +217,7 @@ void gfx_lineTo     (Bitmap *bm, coord_t x,  coord_t y);
 void gfx_setClipRect(Bitmap *bm, coord_t xmin, coord_t ymin, coord_t xmax, coord_t ymax);
 
 #if CPU_HARVARD
-	#include <mware/pgm.h>
+	#include <cpu/pgm.h>
 	void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster);
 #endif
 
@@ -201,4 +237,5 @@ void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2);
 
 EXTERN_C_END
 
+/** \} */ //defgroup gfx
 #endif /* GFX_GFX_H */