MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use __XTENSA__

This commit is contained in:
devsaurus 2015-02-08 14:51:41 +01:00
parent 5a67fec4f3
commit c1662a9932
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/u8glib/u8g.h
View File

@ -50,8 +50,10 @@ typedef unsigned char uint8_t;
typedef signed char int8_t; typedef signed char int8_t;
typedef unsigned short uint16_t; typedef unsigned short uint16_t;
typedef signed short int16_t; typedef signed short int16_t;
#elif defined(__XTENSA__)
# include <c_types.h>
#else #else
#include <c_types.h> # include <stdint.h>
#endif #endif
#if defined(__AVR__) #if defined(__AVR__)
@ -85,15 +87,19 @@ extern "C" {
# if defined(__AVR__) # if defined(__AVR__)
# define U8G_FONT_SECTION(name) U8G_SECTION(".progmem." name) # define U8G_FONT_SECTION(name) U8G_SECTION(".progmem." name)
# endif # endif
# if defined(__XTENSA__)
# define U8G_FONT_SECTION(name) U8G_SECTION(".u8g_progmem." name)
# endif
#else #else
# define U8G_NOINLINE # define U8G_NOINLINE
# define U8G_PURE # define U8G_PURE
# define U8G_NOCOMMON # define U8G_NOCOMMON
# define U8G_SECTION(name) # define U8G_SECTION(name)
# define U8G_FONT_SECTION(name)
#endif #endif
#ifndef U8G_FONT_SECTION #ifndef U8G_FONT_SECTION
# define U8G_FONT_SECTION(name) U8G_SECTION(".u8g_progmem." name) # define U8G_FONT_SECTION(name)
#endif #endif
@ -108,15 +114,21 @@ typedef uint8_t u8g_fntpgm_uint8_t;
#define u8g_pgm_read(adr) pgm_read_byte_near(adr) #define u8g_pgm_read(adr) pgm_read_byte_near(adr)
#define U8G_PSTR(s) ((u8g_pgm_uint8_t *)PSTR(s)) #define U8G_PSTR(s) ((u8g_pgm_uint8_t *)PSTR(s))
#else #elif defined(__XTENSA__)
# define U8G_PROGMEM
# define PROGMEM U8G_SECTION(".u8g_progmem.data")
typedef uint8_t u8g_pgm_uint8_t;
typedef uint8_t u8g_fntpgm_uint8_t;
u8g_pgm_uint8_t u8g_pgm_read(const u8g_pgm_uint8_t *adr);
# define U8G_PSTR(s) ((u8g_pgm_uint8_t *)(s))
#define U8G_PROGMEM #else
#define PROGMEM U8G_SECTION(".u8g_progmem.data") # define U8G_PROGMEM
typedef uint8_t u8g_pgm_uint8_t; # define PROGMEM
typedef uint8_t u8g_fntpgm_uint8_t; typedef uint8_t u8g_pgm_uint8_t;
//#define u8g_pgm_read(adr) (*(const u8g_pgm_uint8_t *)(adr)) typedef uint8_t u8g_fntpgm_uint8_t;
u8g_pgm_uint8_t u8g_pgm_read(const u8g_pgm_uint8_t *adr); # define u8g_pgm_read(adr) (*(const u8g_pgm_uint8_t *)(adr))
#define U8G_PSTR(s) ((u8g_pgm_uint8_t *)(s)) # define U8G_PSTR(s) ((u8g_pgm_uint8_t *)(s))
#endif #endif
@ -153,7 +165,6 @@ typedef struct _u8g_dev_arg_bbx_t u8g_dev_arg_bbx_t;
typedef struct _u8g_box_t u8g_box_t; typedef struct _u8g_box_t u8g_box_t;
typedef struct _u8g_dev_arg_irgb_t u8g_dev_arg_irgb_t; typedef struct _u8g_dev_arg_irgb_t u8g_dev_arg_irgb_t;
typedef struct _pg_struct pg_struct;
/*===============================================================*/ /*===============================================================*/
/* generic */ /* generic */
@ -798,9 +809,11 @@ defined(__18CXX) || defined(__PIC32MX)
#endif #endif
#ifndef U8G_COM_SSD_I2C #ifndef U8G_COM_SSD_I2C
#if defined(__XTENSA__)
// ESP8266 // ESP8266
#define U8G_COM_SSD_I2C u8g_com_esp8266_ssd_i2c_fn #define U8G_COM_SSD_I2C u8g_com_esp8266_ssd_i2c_fn
#endif #endif
#endif
#ifndef U8G_COM_SSD_I2C #ifndef U8G_COM_SSD_I2C
#define U8G_COM_SSD_I2C u8g_com_null_fn #define U8G_COM_SSD_I2C u8g_com_null_fn
@ -1312,6 +1325,8 @@ struct pg_point_struct
pg_word_t y; pg_word_t y;
}; };
typedef struct _pg_struct pg_struct; /* forward declaration */
struct pg_edge_struct struct pg_edge_struct
{ {
pg_word_t x_direction; /* 1, if x2 is greater than x1, -1 otherwise */ pg_word_t x_direction; /* 1, if x2 is greater than x1, -1 otherwise */