diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-06-23 13:02:07 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-06-23 13:02:07 +1000 |
| commit | 41271d632b74f5cf47c30d3b699eb6b2786f2136 (patch) | |
| tree | 78bcb729c6d6177ca598f28908fefd186c50e9b6 /drivers | |
| parent | 3b97fb798e96514057bcf17263c1e5dbdcd7da26 (diff) | |
| download | uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.gz uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.bz2 uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.zip | |
Added new type definitions - moving towards V3.0
Diffstat (limited to 'drivers')
108 files changed, 472 insertions, 471 deletions
diff --git a/drivers/gaudio/Win32/gaudio_play_Win32.c b/drivers/gaudio/Win32/gaudio_play_Win32.c index 7bca6e04..33342151 100644 --- a/drivers/gaudio/Win32/gaudio_play_Win32.c +++ b/drivers/gaudio/Win32/gaudio_play_Win32.c @@ -31,7 +31,7 @@ static HWAVEOUT ah = 0; static volatile int nQueuedBuffers; -static bool_t isRunning; +static gBool isRunning; static WAVEHDR WaveHdrs[MAX_WAVE_HEADERS]; static HANDLE waveThread; static DWORD threadID; @@ -46,7 +46,7 @@ static DWORD threadID; * anyway, so instead just use CALLBACK_THREAD here instead. *************************************************************************/ -static bool_t senddata(WAVEHDR *pwh) { +static gBool senddata(WAVEHDR *pwh) { GDataBuffer *paud; // Get the next data block to send @@ -56,7 +56,7 @@ static bool_t senddata(WAVEHDR *pwh) { gaudioPlayDoneI(); gfxSystemUnlock(); if (!paud) - return FALSE; + return gFalse; // Prepare the wave header for Windows pwh->dwUser = (DWORD_PTR)paud; @@ -76,7 +76,7 @@ static bool_t senddata(WAVEHDR *pwh) { } nQueuedBuffers++; - return TRUE; + return gTrue; } static DWORD WINAPI waveProc(LPVOID arg) { @@ -122,11 +122,11 @@ static DWORD WINAPI waveProc(LPVOID arg) { /* External declarations. */ /*===========================================================================*/ -bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { +gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { WAVEFORMATEX wfx; if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_16BITSIGNED) - return FALSE; + return gFalse; if (!waveThread) { if (!(waveThread = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)waveProc, 0, 0, &threadID))) { @@ -153,19 +153,19 @@ bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataForma exit(-1); } - return TRUE; + return gTrue; } -bool_t gaudio_play_lld_set_volume(uint8_t vol) { +gBool gaudio_play_lld_set_volume(uint8_t vol) { if (!ah) - return FALSE; + return gFalse; return waveOutSetVolume(ah, (((uint16_t)vol)<<8)|vol) != 0; } void gaudio_play_lld_start(void) { WAVEHDR *pwh; - isRunning = TRUE; + isRunning = gTrue; while (nQueuedBuffers < MAX_WAVE_HEADERS) { // Find the empty one - there will always be at least one. for(pwh = WaveHdrs; pwh->lpData; pwh++); @@ -177,7 +177,7 @@ void gaudio_play_lld_start(void) { } void gaudio_play_lld_stop(void) { - isRunning = FALSE; + isRunning = gFalse; waveOutReset(ah); while(nQueuedBuffers) Sleep(1); } diff --git a/drivers/gaudio/Win32/gaudio_record_Win32.c b/drivers/gaudio/Win32/gaudio_record_Win32.c index 1c86c37f..065c2e5f 100644 --- a/drivers/gaudio/Win32/gaudio_record_Win32.c +++ b/drivers/gaudio/Win32/gaudio_record_Win32.c @@ -31,7 +31,7 @@ static HWAVEIN ah = 0; static volatile int nQueuedBuffers; -static bool_t isRunning; +static gBool isRunning; static WAVEHDR WaveHdrs[MAX_WAVE_HEADERS]; static HANDLE waveThread; static DWORD threadID; @@ -46,7 +46,7 @@ static DWORD threadID; * anyway, so instead just use CALLBACK_THREAD here instead. *************************************************************************/ -static bool_t getbuffer(WAVEHDR *pwh) { +static gBool getbuffer(WAVEHDR *pwh) { GDataBuffer *paud; // Get the next data block to send @@ -56,7 +56,7 @@ static bool_t getbuffer(WAVEHDR *pwh) { gaudioRecordDoneI(); gfxSystemUnlock(); if (!paud) - return FALSE; + return gFalse; // Prepare the wave header for Windows pwh->dwUser = (DWORD_PTR)paud; @@ -75,7 +75,7 @@ static bool_t getbuffer(WAVEHDR *pwh) { } nQueuedBuffers++; - return TRUE; + return gTrue; } static DWORD WINAPI waveProc(LPVOID arg) { @@ -124,11 +124,11 @@ static DWORD WINAPI waveProc(LPVOID arg) { /* External declarations. */ /*===========================================================================*/ -bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { +gBool gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { WAVEFORMATEX wfx; if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_16BITSIGNED) - return FALSE; + return gFalse; if (!waveThread) { if (!(waveThread = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)waveProc, 0, 0, &threadID))) { @@ -155,7 +155,7 @@ bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFor exit(-1); } - return TRUE; + return gTrue; } void gaudio_record_lld_start(void) { @@ -173,13 +173,13 @@ void gaudio_record_lld_start(void) { break; } if (!isRunning) { - isRunning = TRUE; + isRunning = gTrue; waveInStart(ah); } } void gaudio_record_lld_stop(void) { - isRunning = FALSE; + isRunning = gFalse; waveInReset(ah); while(nQueuedBuffers) Sleep(1); } diff --git a/drivers/gaudio/gadc/gaudio_record_gadc.c b/drivers/gaudio/gadc/gaudio_record_gadc.c index c894c84b..01eebd7e 100644 --- a/drivers/gaudio/gadc/gaudio_record_gadc.c +++ b/drivers/gaudio/gadc/gaudio_record_gadc.c @@ -30,10 +30,10 @@ static void gadcCallbackI(void) { /* External declarations. */ /*===========================================================================*/ -bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { +gBool gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { /* Check the parameters */ if (channel >= GAUDIO_RECORD_NUM_CHANNELS || frequency > GAUDIO_RECORD_MAX_SAMPLE_FREQUENCY || format != GAUDIO_RECORD_FORMAT1) - return FALSE; + return gFalse; /* Setup the high speed GADC */ gadcHighSpeedInit(gaudio_gadc_physdevs[channel], frequency); @@ -41,7 +41,7 @@ bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFor /* Register ourselves for ISR callbacks */ gadcHighSpeedSetISRCallback(gadcCallbackI); - return TRUE; + return gTrue; } void gaudio_record_lld_start(void) { diff --git a/drivers/gaudio/pwm/gaudio_play_board_template.h b/drivers/gaudio/pwm/gaudio_play_board_template.h index 24039d17..c2a91fe1 100644 --- a/drivers/gaudio/pwm/gaudio_play_board_template.h +++ b/drivers/gaudio/pwm/gaudio_play_board_template.h @@ -15,10 +15,10 @@ * */ -static bool gaudio_play_pwm_setup(uint32_t frequency, ArrayDataFormat format) { +static gBool gaudio_play_pwm_setup(uint32_t frequency, ArrayDataFormat format) { /* Initialise the PWM - use a midpoint value for the initial PWM value */ /* Initialise the timer interrupt @ frequency */ - /* Return FALSE if any parameter invalid */ + /* Return gFalse if any parameter invalid */ } static void gaudio_play_pwm_start(void) { diff --git a/drivers/gaudio/pwm/gaudio_play_pwm.c b/drivers/gaudio/pwm/gaudio_play_pwm.c index 91d7a835..ab83852d 100644 --- a/drivers/gaudio/pwm/gaudio_play_pwm.c +++ b/drivers/gaudio/pwm/gaudio_play_pwm.c @@ -65,19 +65,19 @@ static void gaudio_play_pwm_timer_callbackI(void) { /* External declarations. */ /*===========================================================================*/ -bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { +gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { (void) channel; if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_10BITUNSIGNED) - return FALSE; + return gFalse; playfmt = format; return gaudio_play_pwm_setup(frequency, format); } -bool_t gaudio_play_lld_set_volume(uint8_t vol) { +gBool gaudio_play_lld_set_volume(uint8_t vol) { (void) vol; - return FALSE; + return gFalse; } void gaudio_play_lld_start(void) { diff --git a/drivers/gaudio/vs1053/gaudio_play_board_template.h b/drivers/gaudio/vs1053/gaudio_play_board_template.h index d6125bbc..273bd7ed 100644 --- a/drivers/gaudio/vs1053/gaudio_play_board_template.h +++ b/drivers/gaudio/vs1053/gaudio_play_board_template.h @@ -24,7 +24,7 @@ static void board_reset(void) { } // Returns the state of the dreq pin -static bool board_dreq(void) { +static gBool board_dreq(void) { } diff --git a/drivers/gaudio/vs1053/gaudio_play_vs1053.c b/drivers/gaudio/vs1053/gaudio_play_vs1053.c index c96ec036..8b333741 100644 --- a/drivers/gaudio/vs1053/gaudio_play_vs1053.c +++ b/drivers/gaudio/vs1053/gaudio_play_vs1053.c @@ -61,7 +61,7 @@ #endif // Our static variables -static bool_t vs1053_isinit; +static gBool vs1053_isinit; static GTimer playTimer; // Some common macro's @@ -228,7 +228,7 @@ static void FeedData(void *param) { /* External declarations. */ /*===========================================================================*/ -bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { +gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) { uint32_t brate; uint32_t bps; uint8_t buf[4]; @@ -246,14 +246,14 @@ bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataForma }; if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_16BITSIGNED && format != ARRAY_DATA_UNKNOWN) - return FALSE; + return gFalse; if (frequency > VS1053_MAX_SAMPLE_RATE) - return FALSE; + return gFalse; // Reset the chip if needed if (!vs1053_isinit) { vs1053_hard_reset(); - vs1053_isinit = TRUE; + vs1053_isinit = gTrue; } // Setup @@ -274,10 +274,10 @@ bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataForma buf[0] = gfxSampleFormatBits(format); buf[1] = 0; data_write(buf, 2); data_write(hdr2, sizeof(hdr2)); } - return TRUE; + return gTrue; } -bool_t gaudio_play_lld_set_volume(uint8_t vol) { +gBool gaudio_play_lld_set_volume(uint8_t vol) { uint16_t tmp; // Volume is 0xFE -> 0x00. Adjust vol to match @@ -291,7 +291,7 @@ bool_t gaudio_play_lld_set_volume(uint8_t vol) { cmd_write(SCI_VOL, tmp); - return TRUE; + return gTrue; } void gaudio_play_lld_start(void) { @@ -310,7 +310,7 @@ void gaudio_play_lld_start(void) { // Start the playing by starting the timer and executing FeedData immediately just to get things started // We really should set the timer to be equivalent to half the available data but that is just too hard to calculate. - gtimerStart(&playTimer, FeedData, 0, TRUE, VS1053_POLL_RATE); + gtimerStart(&playTimer, FeedData, 0, gTrue, VS1053_POLL_RATE); FeedData(0); } diff --git a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c index 50160f9b..1fb34378 100644 --- a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c +++ b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c @@ -46,7 +46,7 @@ typedef struct fbPriv { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay* g) +LLDSPEC gBool gdisp_lld_init(GDisplay* g) { // Allocate the frame buffers PRIV(g)->frame0 = gfxAlloc(SCREEN_WIDTH * SCREEN_HEIGHT * sizeof(LLDCOLOR_TYPE)); @@ -94,7 +94,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) // Start the framebuffer reader IOWR(ALT_VIP_VFR_0_BASE, 0x00, 0x01); - return TRUE; + return gTrue; } LLDSPEC void gdisp_lld_draw_pixel(GDisplay* g) diff --git a/drivers/gdisp/ED060SC4/board_ED060SC4_example.h b/drivers/gdisp/ED060SC4/board_ED060SC4_example.h index 6cda606b..95823edc 100644 --- a/drivers/gdisp/ED060SC4/board_ED060SC4_example.h +++ b/drivers/gdisp/ED060SC4/board_ED060SC4_example.h @@ -69,38 +69,38 @@ static void eink_delay(int us) } /* Turn the E-ink panel Vdd supply (+3.3V) on or off. */ -static GFXINLINE void setpower_vdd(bool_t on) { +static GFXINLINE void setpower_vdd(gBool on) { palWritePad(GPIOB, GPIOB_SMPS_CTRL, !on); palWritePad(GPIOA, GPIOA_EINK_VDD, on); } /* Turn the E-ink panel negative supplies (-15V, -20V) on or off. */ -static GFXINLINE void setpower_vneg(bool_t on) { +static GFXINLINE void setpower_vneg(gBool on) { palWritePad(GPIOA, GPIOA_VNEG_CTRL, on); } /* Turn the E-ink panel positive supplies (-15V, -20V) on or off. */ -static GFXINLINE void setpower_vpos(bool_t on) { +static GFXINLINE void setpower_vpos(gBool on) { palWritePad(GPIOA, GPIOA_VPOS_CTRL, on); } /* Set the state of the LE (source driver Latch Enable) pin. */ -static GFXINLINE void setpin_le(bool_t on) { +static GFXINLINE void setpin_le(gBool on) { palWritePad(GPIOB, GPIOB_EINK_LE, on); } /* Set the state of the OE (source driver Output Enable) pin. */ -static GFXINLINE void setpin_oe(bool_t on) { +static GFXINLINE void setpin_oe(gBool on) { palWritePad(GPIOB, GPIOB_EINK_OE, on); } /* Set the state of the CL (source driver Clock) pin. */ -static GFXINLINE void setpin_cl(bool_t on) { +static GFXINLINE void setpin_cl(gBool on) { palWritePad(GPIOB, GPIOB_EINK_CL, on); } /* Set the state of the SPH (source driver Start Pulse Horizontal) pin. */ -static GFXINLINE void setpin_sph(bool_t on) { +static GFXINLINE void setpin_sph(gBool on) { palWritePad(GPIOB, GPIOB_EINK_SPH, on); } @@ -110,17 +110,17 @@ static GFXINLINE void setpins_data(uint8_t value) { } /* Set the state of the CKV (gate driver Clock Vertical) pin. */ -static GFXINLINE void setpin_ckv(bool_t on) { +static GFXINLINE void setpin_ckv(gBool on) { palWritePad(GPIOB, GPIOB_EINK_CKV, on); } /* Set the state of the GMODE (gate driver Gate Mode) pin. */ -static GFXINLINE void setpin_gmode(bool_t on) { +static GFXINLINE void setpin_gmode(gBool on) { palWritePad(GPIOC, GPIOC_EINK_GMODE, on); } /* Set the state of the SPV (gate driver Start Pulse Vertical) pin. */ -static GFXINLINE void setpin_spv(bool_t on) { +static GFXINLINE void setpin_spv(gBool on) { palWritePad(GPIOB, GPIOB_EINK_SPV, on); } diff --git a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h index ad261b44..71c9caae 100644 --- a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h +++ b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h @@ -54,37 +54,37 @@ static void eink_delay(int us) { (void) us; } -static GFXINLINE void setpower_vdd(GDisplay *g, bool_t on) { +static GFXINLINE void setpower_vdd(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpower_vneg(GDisplay *g, bool_t on) { +static GFXINLINE void setpower_vneg(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpower_vpos(GDisplay *g, bool_t on) { +static GFXINLINE void setpower_vpos(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpin_le(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_le(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpin_oe(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_oe(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpin_cl(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_cl(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpin_sph(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_sph(GDisplay *g, gBool on) { (void) g; (void) on; } @@ -94,17 +94,17 @@ static GFXINLINE void setpins_data(GDisplay *g, uint8_t value) { (void) value; } -static GFXINLINE void setpin_ckv(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_ckv(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpin_gmode(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_gmode(GDisplay *g, gBool on) { (void) g; (void) on; } -static GFXINLINE void setpin_spv(GDisplay *g, bool_t on) { +static GFXINLINE void setpin_spv(GDisplay *g, gBool on) { (void) g; (void) on; } diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c index 3272ca0a..a745ab86 100644 --- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c +++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c @@ -109,9 +109,9 @@ static GFXINLINE void clockdelay(void) /* Fast vertical clock pulse for gate driver, used during initializations */ static void vclock_quick(GDisplay *g) { - setpin_ckv(g, TRUE); + setpin_ckv(g, gTrue); eink_delay(1); - setpin_ckv(g, FALSE); + setpin_ckv(g, gFalse); eink_delay(4); } @@ -119,9 +119,9 @@ static void vclock_quick(GDisplay *g) static void hclock(GDisplay *g) { clockdelay(); - setpin_cl(g, TRUE); + setpin_cl(g, gTrue); clockdelay(); - setpin_cl(g, FALSE); + setpin_cl(g, gFalse); } /* Start a new vertical gate driver scan from top. @@ -131,11 +131,11 @@ static void hclock(GDisplay *g) */ static void vscan_start(GDisplay *g) { - setpin_gmode(g, TRUE); + setpin_gmode(g, gTrue); vclock_quick(g); - setpin_spv(g, FALSE); + setpin_spv(g, gFalse); vclock_quick(g); - setpin_spv(g, TRUE); + setpin_spv(g, gTrue); vclock_quick(g); } @@ -145,11 +145,11 @@ static void vscan_start(GDisplay *g) */ static void vscan_write(GDisplay *g) { - setpin_ckv(g, TRUE); - setpin_oe(g, TRUE); + setpin_ckv(g, gTrue); + setpin_oe(g, gTrue); eink_delay(5); - setpin_oe(g, FALSE); - setpin_ckv(g, FALSE); + setpin_oe(g, gFalse); + setpin_ckv(g, gFalse); eink_delay(200); } @@ -158,9 +158,9 @@ static void vscan_write(GDisplay *g) */ static void vscan_bulkwrite(GDisplay *g) { - setpin_ckv(g, TRUE); + setpin_ckv(g, gTrue); eink_delay(20); - setpin_ckv(g, FALSE); + setpin_ckv(g, gFalse); eink_delay(200); } @@ -169,9 +169,9 @@ static void vscan_bulkwrite(GDisplay *g) */ static void vscan_skip(GDisplay *g) { - setpin_ckv(g, TRUE); + setpin_ckv(g, gTrue); eink_delay(1); - setpin_ckv(g, FALSE); + setpin_ckv(g, gFalse); eink_delay(100); } @@ -180,7 +180,7 @@ static void vscan_skip(GDisplay *g) */ static void vscan_stop(GDisplay *g) { - setpin_gmode(g, FALSE); + setpin_gmode(g, gFalse); vclock_quick(g); vclock_quick(g); vclock_quick(g); @@ -192,11 +192,11 @@ static void vscan_stop(GDisplay *g) static void hscan_start(GDisplay *g) { /* Disable latching and output enable while we are modifying the row. */ - setpin_le(g, FALSE); - setpin_oe(g, FALSE); + setpin_le(g, gFalse); + setpin_oe(g, gFalse); /* The start pulse should remain low for the duration of the row. */ - setpin_sph(g, FALSE); + setpin_sph(g, gFalse); } /* Write data to the horizontal row. */ @@ -217,13 +217,13 @@ static void hscan_write(GDisplay *g, const uint8_t *data, int count) static void hscan_stop(GDisplay *g) { /* End the scan */ - setpin_sph(g, TRUE); + setpin_sph(g, gTrue); hclock(g); /* Latch the new data */ - setpin_le(g, TRUE); + setpin_le(g, gTrue); clockdelay(); - setpin_le(g, FALSE); + setpin_le(g, gFalse); } /* Turn on the power to the E-Ink panel, observing proper power sequencing. */ @@ -232,25 +232,25 @@ static void power_on(GDisplay *g) unsigned i; /* First the digital power supply and signal levels. */ - setpower_vdd(g, TRUE); - setpin_le(g, FALSE); - setpin_oe(g, FALSE); - setpin_cl(g, FALSE); - setpin_sph(g, TRUE); + setpower_vdd(g, gTrue); + setpin_le(g, gFalse); + setpin_oe(g, gFalse); + setpin_cl(g, gFalse); + setpin_sph(g, gTrue); setpins_data(g, 0); - setpin_ckv(g, FALSE); - setpin_gmode(g, FALSE); - setpin_spv(g, TRUE); + setpin_ckv(g, gFalse); + setpin_gmode(g, gFalse); + setpin_spv(g, gTrue); /* Min. 100 microsecond delay after digital supply */ gfxSleepMicroseconds(100); /* Then negative voltages and min. 1000 microsecond delay. */ - setpower_vneg(g, TRUE); + setpower_vneg(g, gTrue); gfxSleepMicroseconds(1000); /* Finally the positive voltages. */ - setpower_vpos(g, TRUE); + setpower_vpos(g, gTrue); /* Clear the vscan shift register */ vscan_start(g); @@ -263,22 +263,22 @@ static void power_on(GDisplay *g) static void power_off(GDisplay *g) { /* First the high voltages */ - setpower_vpos(g, FALSE); - setpower_vneg(g, FALSE); + setpower_vpos(g, gFalse); + setpower_vneg(g, gFalse); /* Wait for any capacitors to drain */ gfxSleepMilliseconds(100); /* Then put all signals and digital supply to ground. */ - setpin_le(g, FALSE); - setpin_oe(g, FALSE); - setpin_cl(g, FALSE); - setpin_sph(g, FALSE); + setpin_le(g, gFalse); + setpin_oe(g, gFalse); + setpin_cl(g, gFalse); + setpin_sph(g, gFalse); setpins_data(g, 0); - setpin_ckv(g, FALSE); - setpin_gmode(g, FALSE); - setpin_spv(g, FALSE); - setpower_vdd(g, FALSE); + setpin_ckv(g, gFalse); + setpin_gmode(g, gFalse); + setpin_spv(g, gFalse); + setpower_vdd(g, gFalse); } /* ==================================== @@ -332,17 +332,17 @@ typedef struct drvPriv { } drvPriv; /* Check if the row contains any allocated blocks. */ -static bool_t blocks_on_row(GDisplay *g, unsigned by) +static gBool blocks_on_row(GDisplay *g, unsigned by) { unsigned bx; for (bx = 0; bx < BLOCKS_X; bx++) { if (PRIV(g)->g_blockmap[by][bx] != 0) { - return TRUE; + return gTrue; } } - return FALSE; + return gFalse; } /* Write out a block row. */ @@ -432,7 +432,7 @@ static block_t *alloc_buffer(GDisplay *g, unsigned bx, unsigned by) /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { g->priv = gfxAlloc(sizeof(drvPriv)); init_board(g); @@ -452,7 +452,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = 100; g->g.Contrast = 100; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH @@ -593,12 +593,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { } hscan_stop(g); - setpin_oe(g, TRUE); + setpin_oe(g, gTrue); vscan_start(g); for (y = 0; y < GDISP_SCREEN_HEIGHT; y++) vscan_bulkwrite(g); vscan_stop(g); - setpin_oe(g, FALSE); + setpin_oe(g, gFalse); } void gdisp_lld_clear(GDisplay *g) { diff --git a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c index 4d981ce4..61f7b500 100644 --- a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c +++ b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c @@ -39,7 +39,7 @@ typedef struct fbPriv { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // Initialize the private structure if (!(g->priv = gfxAlloc(sizeof(fbPriv)))) @@ -53,7 +53,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->board = 0; // preinitialize board_init(g, &((fbPriv *)g->priv)->fbi); - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/HX8347D/board_HX8347D_template.h b/drivers/gdisp/HX8347D/board_HX8347D_template.h index 3e412e99..5112d648 100644 --- a/drivers/gdisp/HX8347D/board_HX8347D_template.h +++ b/drivers/gdisp/HX8347D/board_HX8347D_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c index 6adead64..792db343 100644 --- a/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c +++ b/drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c @@ -56,7 +56,7 @@ static GFXINLINE void set_viewport(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -64,9 +64,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(1); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(5); // Get the bus for the following initialisation commands @@ -152,7 +152,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ILI9225/gdisp_lld_ili9225.c b/drivers/gdisp/ILI9225/gdisp_lld_ili9225.c index 9014ebe3..cb5a1356 100644 --- a/drivers/gdisp/ILI9225/gdisp_lld_ili9225.c +++ b/drivers/gdisp/ILI9225/gdisp_lld_ili9225.c @@ -51,7 +51,7 @@ #define write_data_repeat(g, data, count) { int i; for (i = 0; i < count; ++i) write_data (g, data) } #endif -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -59,9 +59,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -136,7 +136,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } static void set_cursor(GDisplay *g) { diff --git a/drivers/gdisp/ILI9320/board_ILI9320_template.h b/drivers/gdisp/ILI9320/board_ILI9320_template.h index a26ffe94..f99b59ea 100644 --- a/drivers/gdisp/ILI9320/board_ILI9320_template.h +++ b/drivers/gdisp/ILI9320/board_ILI9320_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c index a77e016c..7de1490a 100644 --- a/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c +++ b/drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c @@ -93,7 +93,7 @@ static void set_viewport(GDisplay *g) { } } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { uint16_t cver; // No private area for this controller @@ -103,9 +103,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMicroseconds(1000); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMicroseconds(1000); acquire_bus(g); @@ -190,7 +190,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ILI9325/board_ILI9325_template.h b/drivers/gdisp/ILI9325/board_ILI9325_template.h index a26ffe94..f99b59ea 100644 --- a/drivers/gdisp/ILI9325/board_ILI9325_template.h +++ b/drivers/gdisp/ILI9325/board_ILI9325_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c index d0bb43d1..6582693d 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c +++ b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c @@ -94,7 +94,7 @@ static void set_viewport(GDisplay* g) { } } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { uint16_t cver; // No private area for this controller @@ -104,9 +104,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMicroseconds(1000); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMicroseconds(1000); acquire_bus(g); @@ -189,7 +189,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ILI9341/board_ILI9341_template.h b/drivers/gdisp/ILI9341/board_ILI9341_template.h index aac744f9..8b1dc07c 100644 --- a/drivers/gdisp/ILI9341/board_ILI9341_template.h +++ b/drivers/gdisp/ILI9341/board_ILI9341_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c index c757806f..87c47114 100644 --- a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c +++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c @@ -73,7 +73,7 @@ static void set_viewport(GDisplay *g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -81,9 +81,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -231,7 +231,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c index 33c6712f..1d645443 100644 --- a/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c +++ b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c @@ -70,7 +70,7 @@ static void set_viewport(GDisplay *g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -78,9 +78,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -235,7 +235,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ILI93xx/board_ILI93xx_template.h b/drivers/gdisp/ILI93xx/board_ILI93xx_template.h index a5ac23ec..059dc1a5 100644 --- a/drivers/gdisp/ILI93xx/board_ILI93xx_template.h +++ b/drivers/gdisp/ILI93xx/board_ILI93xx_template.h @@ -18,7 +18,7 @@ static GFXINLINE void post_init_board(GDisplay *g) (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; diff --git a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c index 72f6bac0..e340dc18 100644 --- a/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c +++ b/drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c @@ -100,7 +100,7 @@ static void set_viewport(GDisplay* g) { } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { unsigned short DeviceCode; @@ -111,11 +111,11 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(1); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(10); - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(50); acquire_bus(g); @@ -261,7 +261,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ILI9481/board_ILI9481_template.h b/drivers/gdisp/ILI9481/board_ILI9481_template.h index aac744f9..8b1dc07c 100644 --- a/drivers/gdisp/ILI9481/board_ILI9481_template.h +++ b/drivers/gdisp/ILI9481/board_ILI9481_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c index afd1b3e7..2201cdbc 100644 --- a/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c +++ b/drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c @@ -65,7 +65,7 @@ static void set_viewport(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -73,9 +73,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); /* Get the bus for the following initialisation commands */ @@ -197,7 +197,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ILI9488/board_ILI9488_template.h b/drivers/gdisp/ILI9488/board_ILI9488_template.h index aac744f9..8b1dc07c 100644 --- a/drivers/gdisp/ILI9488/board_ILI9488_template.h +++ b/drivers/gdisp/ILI9488/board_ILI9488_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c b/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c index 84e5c222..c83695d2 100644 --- a/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c +++ b/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c @@ -75,7 +75,7 @@ static void set_viewport(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -83,11 +83,11 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(2); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(10); - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(120); /* Get the bus for the following initialisation commands */ @@ -194,7 +194,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/KS0108/board_KS0108_example.h b/drivers/gdisp/KS0108/board_KS0108_example.h index ffc6e9c2..73912be2 100644 --- a/drivers/gdisp/KS0108/board_KS0108_example.h +++ b/drivers/gdisp/KS0108/board_KS0108_example.h @@ -158,7 +158,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; diff --git a/drivers/gdisp/KS0108/gdisp_lld_KS0108.c b/drivers/gdisp/KS0108/gdisp_lld_KS0108.c index 20b3a5c9..40712485 100644 --- a/drivers/gdisp/KS0108/gdisp_lld_KS0108.c +++ b/drivers/gdisp/KS0108/gdisp_lld_KS0108.c @@ -94,7 +94,7 @@ /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if !KS0108_NEED_READ // The private area is the display surface. g->priv = gfxAlloc(BUFFSZ); @@ -105,9 +105,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); #if KS0108_HAS_RESET //Make Hardware Reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(120); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); #endif gfxSleepMilliseconds(120); write_cmd(g, KS0108_DISP1OFF); @@ -139,7 +139,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } GFXINLINE void KS0108_goto(GDisplay* g, ) { diff --git a/drivers/gdisp/LGDP4532/board_LGDP4532_template.h b/drivers/gdisp/LGDP4532/board_LGDP4532_template.h index ef8e7a3a..f6fe8c4a 100644 --- a/drivers/gdisp/LGDP4532/board_LGDP4532_template.h +++ b/drivers/gdisp/LGDP4532/board_LGDP4532_template.h @@ -18,7 +18,7 @@ static GFXINLINE void post_init_board(GDisplay *g) (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; diff --git a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c index 4be8aca8..65ea6d8b 100644 --- a/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c +++ b/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c @@ -94,7 +94,7 @@ static void set_viewport(GDisplay* g) { } } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -102,9 +102,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(1); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(2); acquire_bus(g); @@ -183,7 +183,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h b/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h index 00762436..dd5828ca 100644 --- a/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h +++ b/drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_template.h @@ -28,7 +28,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c index 05b00dd4..a718a707 100644 --- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c @@ -93,7 +93,7 @@ static GFXINLINE void set_viewport(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -101,9 +101,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); delayms(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); delayms(20); acquire_bus(g); @@ -129,7 +129,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h b/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h index 00762436..dd5828ca 100644 --- a/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h +++ b/drivers/gdisp/Nokia6610GE8/board_Nokia6610GE8_template.h @@ -28,7 +28,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c index 1eea9e58..86f4a94f 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c @@ -190,7 +190,7 @@ static GFXINLINE void set_viewport(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #if GDISP_HARDWARE_STREAM_WRITE g->priv = gfxAlloc(sizeof(dvrPriv)); #else @@ -201,9 +201,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); delayms(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); delayms(20); // Get the bus for the following initialisation commands @@ -245,7 +245,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Contrast = GDISP_INITIAL_CONTRAST; g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/PCD8544/board_PCD8544_template.h b/drivers/gdisp/PCD8544/board_PCD8544_template.h index 01cafefa..0781238f 100644 --- a/drivers/gdisp/PCD8544/board_PCD8544_template.h +++ b/drivers/gdisp/PCD8544/board_PCD8544_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c index fae87409..568860e0 100644 --- a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c +++ b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c @@ -51,7 +51,7 @@ #define GDISP_SCREEN_BYTES ((GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT) / 8) -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. if (!(g->priv = gfxAlloc(GDISP_SCREEN_BYTES))) gfxHalt("GDISP PCD8544: Failed to allocate private memory"); @@ -60,9 +60,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(100); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(100); acquire_bus(g); @@ -91,7 +91,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/PCF8812/board_PCF8812_template.h b/drivers/gdisp/PCF8812/board_PCF8812_template.h index fef65b55..66327b8e 100644 --- a/drivers/gdisp/PCF8812/board_PCF8812_template.h +++ b/drivers/gdisp/PCF8812/board_PCF8812_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c index 5d96c4b1..e7e621cc 100644 --- a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c +++ b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c @@ -56,7 +56,7 @@ //#define GDISP_SCREEN_BYTES ((GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT) / 8) #define GDISP_MATRIX_BYTES ((GDISP_MATRIX_WIDTH * GDISP_MATRIX_HEIGHT) / 8) // real height 65 pixels, this fix 65 / 8 != 9 -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. if (!(g->priv = gfxAlloc(GDISP_MATRIX_BYTES))) gfxHalt("GDISP PCF8812: Failed to allocate private memory"); @@ -65,9 +65,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(100); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(100); acquire_bus(g); @@ -101,7 +101,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/QImage/gdisp_lld_driver.c b/drivers/gdisp/QImage/gdisp_lld_driver.c index dbd7c279..a93d1761 100644 --- a/drivers/gdisp/QImage/gdisp_lld_driver.c +++ b/drivers/gdisp/QImage/gdisp_lld_driver.c @@ -27,13 +27,13 @@ #define GDISP_INITIAL_BACKLIGHT 100 #endif -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { /* No board interface and no private driver area */ g->priv = g->board = 0; if (!qimage_init(g, GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT)) { - return FALSE; + return gFalse; } /* Initialise the GDISP structure */ @@ -44,7 +44,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_DRAWPIXEL diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp index a133dfb4..ba7cf44d 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp @@ -3,17 +3,17 @@ #include "../../../src/gdisp/gdisp_driver.h" #include "gdisp_lld_qimage.h" -bool_t qimage_init(GDisplay* g, coord_t width, coord_t height) +gBool qimage_init(GDisplay* g, coord_t width, coord_t height) { QImage* qimage = new QImage(width, height, QImage::Format_RGB888); if (!qimage) { - return FALSE; + return gFalse; } qimage->fill(Qt::gray); g->priv = qimage; - return TRUE; + return gTrue; } void qimage_setPixel(GDisplay* g) diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.h b/drivers/gdisp/QImage/gdisp_lld_qimage.h index 9e855f08..512fdf53 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.h +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.h @@ -2,11 +2,12 @@ #include "../../../gfx.h" +/* This test is needed as this file is also included in the .cpp file providing the below functions */ #ifdef __cplusplus extern "C" { #endif -bool_t qimage_init(GDisplay* g, coord_t width, coord_t height); +gBool qimage_init(GDisplay* g, coord_t width, coord_t height); void qimage_setPixel(GDisplay* g); color_t qimage_getPixel(GDisplay* g); diff --git a/drivers/gdisp/R61505U/board_R61505U_template.h b/drivers/gdisp/R61505U/board_R61505U_template.h index a26ffe94..f99b59ea 100644 --- a/drivers/gdisp/R61505U/board_R61505U_template.h +++ b/drivers/gdisp/R61505U/board_R61505U_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c index 4346d3da..8b48eee2 100644 --- a/drivers/gdisp/R61505U/gdisp_lld_R61505U.c +++ b/drivers/gdisp/R61505U/gdisp_lld_R61505U.c @@ -93,7 +93,7 @@ static void set_viewport(GDisplay *g) { } } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { uint16_t cver; // No private area for this controller @@ -103,9 +103,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMicroseconds(1000); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMicroseconds(1000); acquire_bus(g); @@ -198,7 +198,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/RA6963/board_RA6963.h b/drivers/gdisp/RA6963/board_RA6963.h index 6d959775..1e4559e5 100755 --- a/drivers/gdisp/RA6963/board_RA6963.h +++ b/drivers/gdisp/RA6963/board_RA6963.h @@ -165,7 +165,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g;
}
-static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) {
+static GFXINLINE void setpin_reset(GDisplay *g, gBool state) {
(void) g;
#if RA6963_HAS_RESET //Make Hardware Reset
if (state)
@@ -199,7 +199,7 @@ static GFXINLINE void release_bus(GDisplay *g) { #if RA6963_NEED_READ
-static GFXINLINE uint8_t RA6963_busy_wait(uint8_t pattern, bool_t lh){
+static GFXINLINE uint8_t RA6963_busy_wait(uint8_t pattern, gBool lh){
uint8_t data;
int ii;
diff --git a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c index 97090d5e..42298656 100755 --- a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c +++ b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c @@ -141,7 +141,7 @@ /* Driver exported functions. */
/*===========================================================================*/
-LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if RA6963_NEED_READ
g->priv = 0;
#else
@@ -152,9 +152,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g);
#if RA6963_HAS_RESET //Make Hardware Reset
- setpin_reset(g, TRUE);
+ setpin_reset(g, gTrue);
gfxSleepMilliseconds(100);
- setpin_reset(g, FALSE);
+ setpin_reset(g, gFalse);
#endif
gfxSleepMilliseconds(50);
//RA6963 needs Data first THEN command!
@@ -207,7 +207,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
g->g.Contrast = GDISP_INITIAL_CONTRAST;
- return TRUE;
+ return gTrue;
}
static void set_viewport(GDisplay *g) {
diff --git a/drivers/gdisp/RA8875/board_RA8875_template.h b/drivers/gdisp/RA8875/board_RA8875_template.h index 19793bc4..c5e8346f 100644 --- a/drivers/gdisp/RA8875/board_RA8875_template.h +++ b/drivers/gdisp/RA8875/board_RA8875_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c index 4026237a..75702d09 100644 --- a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c +++ b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c @@ -101,7 +101,7 @@ static GFXINLINE void set_backlight(GDisplay* g, uint8_t percent) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -109,9 +109,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -170,7 +170,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/S6D1121/board_S6D1121_template.h b/drivers/gdisp/S6D1121/board_S6D1121_template.h index aac744f9..8b1dc07c 100644 --- a/drivers/gdisp/S6D1121/board_S6D1121_template.h +++ b/drivers/gdisp/S6D1121/board_S6D1121_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c index 0d9a0d7c..526426b2 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c +++ b/drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c @@ -111,7 +111,7 @@ static GFXINLINE void set_viewport(GDisplay *g) { } } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -119,9 +119,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); /* Hardware reset */ - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); delayms(20); - setpin_reset(g, TRUE); + setpin_reset(g, gFalse); delayms(20); /* Get the bus for the following initialisation commands */ @@ -207,7 +207,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h b/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h index 345a1a8b..509c50c3 100644 --- a/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h +++ b/drivers/gdisp/SPFD54124B/board_SPFD54124B_template.h @@ -18,7 +18,7 @@ static GFXINLINE void post_init_board(GDisplay *g) (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; diff --git a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c index 6a3457d9..35ad43cb 100644 --- a/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c +++ b/drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c @@ -102,7 +102,7 @@ const uint16_t lcd_init_list[] = { SPFD54124B_CMD_NORON }; -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -111,9 +111,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); delayms(100); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); delayms(100); acquire_bus(g); @@ -141,7 +141,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/SSD1289/board_SSD1289_template.h b/drivers/gdisp/SSD1289/board_SSD1289_template.h index bbf8147a..5d9442e9 100644 --- a/drivers/gdisp/SSD1289/board_SSD1289_template.h +++ b/drivers/gdisp/SSD1289/board_SSD1289_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c index e88798aa..c4e0a941 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c +++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c @@ -117,7 +117,7 @@ static void set_viewport(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -125,9 +125,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -191,7 +191,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/SSD1306/board_SSD1306_template.h b/drivers/gdisp/SSD1306/board_SSD1306_template.h index 9ab8fd30..a7efa52e 100644 --- a/drivers/gdisp/SSD1306/board_SSD1306_template.h +++ b/drivers/gdisp/SSD1306/board_SSD1306_template.h @@ -18,7 +18,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c index 39d48317..9658cc26 100644 --- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c +++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c @@ -71,7 +71,7 @@ * 64 * 128 / 8 = 1024 bytes. */ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. g->priv = gfxAlloc(GDISP_SCREEN_HEIGHT/8 * SSD1306_PAGE_WIDTH); @@ -90,9 +90,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); acquire_bus(g); @@ -134,7 +134,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/SSD1322/board_SSD1322_template.h b/drivers/gdisp/SSD1322/board_SSD1322_template.h index cb3a4740..883c798d 100644 --- a/drivers/gdisp/SSD1322/board_SSD1322_template.h +++ b/drivers/gdisp/SSD1322/board_SSD1322_template.h @@ -23,7 +23,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c index 961c22f0..6793b461 100644 --- a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c +++ b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c @@ -64,7 +64,7 @@ * 64 * 128 / 2 = 4096 bytes. */ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. g->priv = gfxAlloc(GDISP_SCREEN_HEIGHT * SSD1322_ROW_WIDTH); @@ -73,9 +73,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { post_init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(200); @@ -152,7 +152,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/SSD1331/board_SSD1331_template.h b/drivers/gdisp/SSD1331/board_SSD1331_template.h index db4a8aa2..b3641fb5 100644 --- a/drivers/gdisp/SSD1331/board_SSD1331_template.h +++ b/drivers/gdisp/SSD1331/board_SSD1331_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c index a36320d7..6dcca875 100644 --- a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c +++ b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c @@ -88,7 +88,7 @@ static const uint8_t initdata[] = { SSD1331_DRAW_MODE, SSD1331_DRAW_FILLRECT, }; -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { unsigned i; // No private area for this controller @@ -98,9 +98,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -124,7 +124,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/SSD1351/board_SSD1351_template.h b/drivers/gdisp/SSD1351/board_SSD1351_template.h index dc086977..78d9bd18 100644 --- a/drivers/gdisp/SSD1351/board_SSD1351_template.h +++ b/drivers/gdisp/SSD1351/board_SSD1351_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c b/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c index ebb3e29f..871aa218 100644 --- a/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c +++ b/drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c @@ -56,7 +56,7 @@ /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -64,9 +64,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -135,7 +135,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/SSD1848/board_ssd1848_template.h b/drivers/gdisp/SSD1848/board_ssd1848_template.h index f8081c19..66c85547 100644 --- a/drivers/gdisp/SSD1848/board_ssd1848_template.h +++ b/drivers/gdisp/SSD1848/board_ssd1848_template.h @@ -16,7 +16,7 @@ static void post_init_board(GDisplay *g) { (void) g; } -static void setpin_reset(GDisplay *g, bool_t state) { +static void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c index a1247315..412ba042 100644 --- a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c +++ b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c @@ -116,14 +116,14 @@ static void set_viewport (GDisplay* g) * 128 * 128 / 8 = 2048 bytes. */ -LLDSPEC bool_t gdisp_lld_init (GDisplay *g) +LLDSPEC gBool gdisp_lld_init (GDisplay *g) { uint8_t temp [5] = { 0 }; /* The private area is the display surface. */ g->priv = gfxAlloc (sizeof(DisplayData) + GDISP_SCREEN_WIDTH / 8 * GDISP_SCREEN_HEIGHT); if (!g->priv) - return FALSE; + return gFalse; memset (g->priv, 0, sizeof(DisplayData) + GDISP_SCREEN_WIDTH / 8 * GDISP_SCREEN_HEIGHT); /* Initialise the board interface */ @@ -131,11 +131,11 @@ LLDSPEC bool_t gdisp_lld_init (GDisplay *g) /* Init LCD */ /* Hardware reset */ - setpin_reset (g, FALSE); + setpin_reset (g, gFalse); gfxSleepMilliseconds (50); - setpin_reset (g, TRUE); + setpin_reset (g, gTrue); gfxSleepMilliseconds (50); - setpin_reset (g, FALSE); + setpin_reset (g, gFalse); acquire_bus (g); @@ -217,7 +217,7 @@ LLDSPEC bool_t gdisp_lld_init (GDisplay *g) g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/SSD1963/board_SSD1963_template.h b/drivers/gdisp/SSD1963/board_SSD1963_template.h index 4c615438..7d5fbfb1 100644 --- a/drivers/gdisp/SSD1963/board_SSD1963_template.h +++ b/drivers/gdisp/SSD1963/board_SSD1963_template.h @@ -17,8 +17,8 @@ static const LCD_Parameters DisplayTimings[] = { 2, 2, 10, // Vertical Timings (back porch, front porch, pulse) CALC_PERIOD(272,2,2,10), // Total Vertical Period (calculated from above line) CALC_FPR(480,272,2,2,41,2,2,10,60ULL), // FPR - the 60ULL is the frames per second. Note the ULL! - FALSE, // Flip horizontally - FALSE // Flip vertically + gFalse, // Flip horizontally + gFalse // Flip vertically }, }; @@ -30,7 +30,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c index 35df624f..f5d9fd63 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c +++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c @@ -45,8 +45,8 @@ typedef struct LCD_Parameters { #define LCD_PANEL_TYPE_SERIAL_RGB_MODE ((1<<6) << 8) // Serial RGB mode #define LCD_PANEL_TYPE_SERIAL_RGB_DUMMY_MODE (((1<<5) | (1<<6)) << 8) // Serial RGB+dummy mode - bool_t flipHorz; // Flipping the display horizontally - bool_t flipVert; // Flipping the display vertically + gBool flipHorz; // Flipping the display horizontally + gBool flipVert; // Flipping the display vertically } LCD_Parameters; #include "board_SSD1963.h" @@ -149,7 +149,7 @@ static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { LCD_Parameters * lcdp; /* @@ -168,9 +168,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { #if !GDISP_SSD1963_NO_INIT // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(200); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(200); #endif @@ -271,7 +271,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/SSD2119/board_SSD2119_template.h b/drivers/gdisp/SSD2119/board_SSD2119_template.h index bbf8147a..5d9442e9 100644 --- a/drivers/gdisp/SSD2119/board_SSD2119_template.h +++ b/drivers/gdisp/SSD2119/board_SSD2119_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c index 6426f508..75bea819 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c +++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c @@ -117,7 +117,7 @@ static void set_viewport(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay* g) { +LLDSPEC gBool gdisp_lld_init(GDisplay* g) { // no private area for this controller g->priv = 0; @@ -125,9 +125,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -232,7 +232,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_STREAM_WRITE diff --git a/drivers/gdisp/ST7565/board_ST7565_template.h b/drivers/gdisp/ST7565/board_ST7565_template.h index a73aae89..24de601c 100644 --- a/drivers/gdisp/ST7565/board_ST7565_template.h +++ b/drivers/gdisp/ST7565/board_ST7565_template.h @@ -25,7 +25,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c index ed98a6fa..2639e268 100644 --- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c +++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c @@ -79,20 +79,20 @@ * 64 * 128 / 8 = 1024 bytes. */ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. g->priv = gfxAlloc(GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8); if (!g->priv) { - return FALSE; + return gFalse; } // Initialise the board interface init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); acquire_bus(g); @@ -138,7 +138,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c index db91f82d..983cfa1d 100644 --- a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c +++ b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c @@ -233,7 +233,7 @@ static void execute_cmds(GDisplay *g, const uint8_t *addr) { } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // No private area for this controller g->priv = 0; @@ -241,9 +241,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(20); // Get the bus for the following initialisation commands @@ -264,7 +264,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } static void set_viewport(GDisplay *g) { diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c index 4bc231d9..57253b0d 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c @@ -233,7 +233,7 @@ static void _ltdc_init(void) { _ltdc_reload();
}
-LLDSPEC bool_t gdisp_lld_init(GDisplay* g) {
+LLDSPEC gBool gdisp_lld_init(GDisplay* g) {
// Initialize the private structure
g->priv = 0;
g->board = 0;
@@ -252,7 +252,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) { #endif
if (!(driverCfg.bglayer.layerflags & LTDC_LEF_ENABLE))
- return FALSE;
+ return gFalse;
g->priv = (void *)&driverCfg.bglayer;
@@ -267,7 +267,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) { case 1: // Display 1 is the foreground layer
if (!(driverCfg.fglayer.layerflags & LTDC_LEF_ENABLE))
- return FALSE;
+ return gFalse;
// Load the foreground layer
_ltdc_layer_init(LTDC_Layer2, &driverCfg.fglayer);
@@ -281,7 +281,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) { break;
default: // There is only 1 LTDC in the CPU and only the 2 layers in the LTDC.
- return FALSE;
+ return gFalse;
}
// Initialise the GDISP structure
@@ -292,7 +292,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
g->g.Contrast = GDISP_INITIAL_CONTRAST;
- return TRUE;
+ return gTrue;
}
LLDSPEC void gdisp_lld_draw_pixel(GDisplay* g) {
diff --git a/drivers/gdisp/TLS8204/board_TLS8204_template.h b/drivers/gdisp/TLS8204/board_TLS8204_template.h index 01cafefa..0781238f 100644 --- a/drivers/gdisp/TLS8204/board_TLS8204_template.h +++ b/drivers/gdisp/TLS8204/board_TLS8204_template.h @@ -16,7 +16,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c index 3157eb73..be5bf3c7 100644 --- a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c +++ b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c @@ -53,7 +53,7 @@ #define GDISP_SCREEN_BYTES ((GDISP_TLS8204_WIDTH * GDISP_TLS8204_HEIGHT) / 8) -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. if (!(g->priv = gfxAlloc(GDISP_SCREEN_BYTES))) gfxHalt("GDISP TLS8204: Failed to allocate private memory"); @@ -62,9 +62,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(100); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(100); acquire_bus(g); @@ -105,7 +105,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c index a7d39fd8..f87b273b 100644 --- a/drivers/gdisp/TestStub/gdisp_lld_TestStub.c +++ b/drivers/gdisp/TestStub/gdisp_lld_TestStub.c @@ -26,7 +26,7 @@ #define GDISP_INITIAL_BACKLIGHT 100 #endif -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { /* No board interface and no private driver area */ g->priv = g->board = 0; @@ -37,7 +37,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_DRAWPIXEL diff --git a/drivers/gdisp/UC1601s/board_UC1601s_template.h b/drivers/gdisp/UC1601s/board_UC1601s_template.h index 9ab8fd30..a7efa52e 100644 --- a/drivers/gdisp/UC1601s/board_UC1601s_template.h +++ b/drivers/gdisp/UC1601s/board_UC1601s_template.h @@ -18,7 +18,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c index a6d15c26..479e49e9 100644 --- a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c +++ b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c @@ -71,7 +71,7 @@ /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface. if (!(g->priv = gfxAlloc(GDISP_SCREEN_BYTES))) @@ -85,9 +85,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { init_board(g); // Hardware reset - setpin_reset(g, TRUE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(5); - setpin_reset(g, FALSE); + setpin_reset(g, gFalse); acquire_bus(g); @@ -111,7 +111,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/UC1610/board_UC1610_template.h b/drivers/gdisp/UC1610/board_UC1610_template.h index 206e7c88..4a20c3a2 100644 --- a/drivers/gdisp/UC1610/board_UC1610_template.h +++ b/drivers/gdisp/UC1610/board_UC1610_template.h @@ -17,7 +17,7 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void) g; } -static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } diff --git a/drivers/gdisp/UC1610/gdisp_lld_UC1610.c b/drivers/gdisp/UC1610/gdisp_lld_UC1610.c index 67b74d90..b0d4660b 100644 --- a/drivers/gdisp/UC1610/gdisp_lld_UC1610.c +++ b/drivers/gdisp/UC1610/gdisp_lld_UC1610.c @@ -92,7 +92,7 @@ static void GFXINLINE flush_screen(GDisplay* g) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // The private area is the display surface + flush window structure. g->priv = gfxAlloc(sizeof(UC1610_Window) + GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT / UC1610_PAGE_HEIGHT); @@ -128,7 +128,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Powermode = powerOn; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_DRAWPIXEL diff --git a/drivers/gdisp/UC8173/board_UC8173_template.h b/drivers/gdisp/UC8173/board_UC8173_template.h index 4a164e3a..2a344e02 100644 --- a/drivers/gdisp/UC8173/board_UC8173_template.h +++ b/drivers/gdisp/UC8173/board_UC8173_template.h @@ -21,17 +21,17 @@ #include "UC8173_waveform_examples.h" static UC8173Lut UC8173_ModeTable[] = { // 32 bytes, 512 bytes, 128 bytes, regal - { _lut_KWvcom_DC_A2_240ms, _lut_kw_A2_240ms, _lut_ft, FALSE }, - { _lut_KWvcom_DC_A2_120ms, _lut_kw_A2_120ms, _lut_ft, FALSE }, - { _lut_KWvcom_DC_GU, _lut_kw_GU, _lut_ft, TRUE }, - { _lut_KWvcom_GC, _lut_kw_GC, _lut_ft, FALSE } + { _lut_KWvcom_DC_A2_240ms, _lut_kw_A2_240ms, _lut_ft, gFalse }, + { _lut_KWvcom_DC_A2_120ms, _lut_kw_A2_120ms, _lut_ft, gFalse }, + { _lut_KWvcom_DC_GU, _lut_kw_GU, _lut_ft, gTrue }, + { _lut_KWvcom_GC, _lut_kw_GC, _lut_ft, gFalse } // Add extra lines for other waveforms }; -static GFXINLINE bool_t init_board(GDisplay* g) +static GFXINLINE gBool init_board(GDisplay* g) { (void) g; - return TRUE; + return gTrue; } static GFXINLINE void post_init_board(GDisplay* g) @@ -39,16 +39,16 @@ static GFXINLINE void post_init_board(GDisplay* g) (void) g; } -static GFXINLINE void setpin_reset(GDisplay* g, bool_t state) +static GFXINLINE void setpin_reset(GDisplay *g, gBool state) { (void) g; (void) state; } -static GFXINLINE bool_t getpin_busy(GDisplay* g) +static GFXINLINE gBool getpin_busy(GDisplay* g) { (void)g; - return FALSE; + return gFalse; } static GFXINLINE void acquire_bus(GDisplay* g) diff --git a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c index 6b227ccb..7cb79c7e 100644 --- a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c +++ b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c @@ -28,7 +28,7 @@ typedef struct UC8173Lut { uint8_t const *lutVCOM; // 32 bytes uint8_t const *lutFW; // 512 bytes uint8_t const *lutFT; // 128 bytes - bool_t regal; + gBool regal; } UC8173Lut; #include "board_UC8173.h" @@ -125,14 +125,14 @@ typedef struct UC8173_Private { }; #endif -LLDSPEC bool_t gdisp_lld_init(GDisplay* g) +LLDSPEC gBool gdisp_lld_init(GDisplay* g) { UC8173_Private *priv; // Allocate the private area g->priv = gfxAlloc(sizeof(UC8173_Private)); if (!g->priv) - return FALSE; + return gFalse; priv = (UC8173_Private *)g->priv; // Initialize the private area @@ -142,12 +142,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) // Initialise the board interface if (!init_board(g)) - return FALSE; + return gFalse; // Hardware reset - setpin_reset(g, FALSE); + setpin_reset(g, gTrue); gfxSleepMilliseconds(100); - setpin_reset(g, TRUE); + setpin_reset(g, gFalse); gfxSleepMilliseconds(300); // Acquire the bus @@ -303,7 +303,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) g->g.Backlight = 0; g->g.Contrast = 0; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c index 67c01b66..40f476b4 100644 --- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c +++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c @@ -35,7 +35,7 @@ typedef struct fbPriv { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // Initialize the private structure if (!(g->priv = gfxAlloc(sizeof(fbPriv)))) @@ -49,7 +49,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->board = 0; // preinitialize board_init(g, &((fbPriv *)g->priv)->fbi); - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c index d5412ad2..fb5e4aec 100644 --- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c +++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c @@ -19,7 +19,7 @@ #define CMD_Y 0x91
#define CMD_ENABLE_IRQ 0x80
-static bool_t MouseXYZ(GMouse* m, GMouseReading* pdr)
+static gBool MouseXYZ(GMouse* m, GMouseReading* pdr)
{
(void)m;
@@ -42,7 +42,7 @@ static bool_t MouseXYZ(GMouse* m, GMouseReading* pdr) release_bus(m);
}
- return TRUE;
+ return gTrue;
}
const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h index fcfb1f7a..533b5cb6 100644 --- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h +++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843_board_template.h @@ -19,11 +19,11 @@ // How much extra data to allocate at the end of the GMouse structure for the board's use #define GMOUSE_ADS7843_BOARD_DATA_SIZE 0 -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } -static GFXINLINE bool_t getpin_pressed(GMouse* m) { +static GFXINLINE gBool getpin_pressed(GMouse* m) { } diff --git a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c index ebe1d9c8..7bd82e36 100644 --- a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c +++ b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200.c @@ -17,16 +17,16 @@ #define EXC7200_READ_CMD 0x09 -static bool_t MouseInit(GMouse* m, unsigned driverinstance) +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) { - return FALSE; + return gFalse; } - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { uint8_t rxbuf[10]; @@ -35,7 +35,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) // Read if (!read_bytes(m, EXC7200_READ_CMD, rxbuf, 10)) { - return FALSE; + return gFalse; } // Check if touched @@ -47,7 +47,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) pdr->z = 0; } - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h index 16588a8a..9a2556d3 100644 --- a/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h +++ b/drivers/ginput/touch/EXC7200/gmouse_lld_EXC7200_board_template.h @@ -19,7 +19,7 @@ // How much extra data to allocate at the end of the GMouse structure for the board's use #define GMOUSE_EXC7200_BOARD_DATA_SIZE 0 -static bool_t init_board(GMouse* m, unsigned driverinstance) +static gBool init_board(GMouse* m, unsigned driverinstance) { } diff --git a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c index a55bef65..082c372a 100644 --- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c +++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c @@ -18,11 +18,11 @@ // Hardware definitions #include "drivers/ginput/touch/FT5336/ft5336.h" -static bool_t ft5336Init(GMouse* m, unsigned driverinstance) +static gBool ft5336Init(GMouse* m, unsigned driverinstance) { // Initialize the board stuff if (!init_board(m, driverinstance)) { - return FALSE; + return gFalse; } // We need at least 200 ms worth of delay here... @@ -30,7 +30,7 @@ static bool_t ft5336Init(GMouse* m, unsigned driverinstance) // Check Chip ID if (read_byte(m, FT5336_CHIP_ID_REG) != FT5336_ID_VALUE) { - return FALSE; + return gFalse; } // Disable interrupts. We use this chip in polling mode @@ -53,10 +53,10 @@ static bool_t ft5336Init(GMouse* m, unsigned driverinstance) // Timer to enter 'idle' when in 'Monitor' (ms) write_reg(m, FT5336_PERIODMONITOR_REG, 0x28); */ - return TRUE; + return gTrue; } -static bool_t ft5336ReadXYZ(GMouse* m, GMouseReading* pdr) +static gBool ft5336ReadXYZ(GMouse* m, GMouseReading* pdr) { // Assume not touched. pdr->buttons = 0; @@ -70,7 +70,7 @@ static bool_t ft5336ReadXYZ(GMouse* m, GMouseReading* pdr) pdr->z = 1; } - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h index fb3a8b52..45331b25 100644 --- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h +++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h @@ -25,12 +25,12 @@ // It requires the active area of the touch panel to exactly match the display size. #define GMOUSE_FT5336_SELF_CALIBRATE GFXOFF -static bool_t init_board(GMouse* m, unsigned instance) +static gBool init_board(GMouse* m, unsigned instance) { (void)m; (void)instance; - return TRUE; + return gTrue; } static void write_reg(GMouse* m, uint8_t reg, uint8_t val) diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c index dbd5981c..50fa36a0 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c @@ -18,9 +18,9 @@ // Hardware definitions #include "ft5x06.h" -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -53,10 +53,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, FT5x06_ID_G_PERIODMONITOR, 0x28); release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { // Assume not touched. pdr->buttons = 0; @@ -96,7 +96,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) } release_bus(m); - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h index 728fa695..ded7cfb9 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h @@ -25,7 +25,7 @@ // It requires the active area of the touch panel to exactly match the display size. #define GMOUSE_FT5x06_SELF_CALIBRATE GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } static GFXINLINE void aquire_bus(GMouse* m) { diff --git a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c index 0fc21d18..5f3902b3 100644 --- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c +++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c @@ -18,9 +18,9 @@ // Hardware definitions #include "ft6x06.h" -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -53,10 +53,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, FT6x06_ID_G_PERIODMONITOR, 0x28); release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { // Assume not touched. pdr->buttons = 0; @@ -96,7 +96,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) } release_bus(m); - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h index 85b54652..3f2c63d2 100644 --- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h +++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h @@ -25,7 +25,7 @@ // It requires the active area of the touch panel to exactly match the display size. #define GMOUSE_FT6x06_SELF_CALIBRATE GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } static GFXINLINE void aquire_bus(GMouse* m) { diff --git a/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c b/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c index e1989e03..d1aad3ba 100644 --- a/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c +++ b/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event.c @@ -31,7 +31,7 @@ typedef struct privStruct { GMouseReading lastReading; } privStruct; -static bool_t _init(GMouse* m, unsigned driverInstance) +static gBool _init(GMouse* m, unsigned driverInstance) { (void)driverInstance; @@ -42,7 +42,7 @@ static bool_t _init(GMouse* m, unsigned driverInstance) priv->fd = open(GMOUSE_LINUX_EVENT_DEVICE, O_RDONLY | O_NONBLOCK); if (priv->fd < 0) { fprintf(stderr, "GINPUT Mouse: Cannot open input device (%s)\n", GMOUSE_LINUX_EVENT_DEVICE); - return FALSE; + return gFalse; } // Initialize @@ -51,10 +51,10 @@ static bool_t _init(GMouse* m, unsigned driverInstance) priv->lastReading.y = 0; priv->lastReading.z = 0; - return TRUE; + return gTrue; } -static bool_t _read(GMouse* m, GMouseReading* pdr) +static gBool _read(GMouse* m, GMouseReading* pdr) { int i; int rb; @@ -97,7 +97,7 @@ static bool_t _read(GMouse* m, GMouseReading* pdr) priv->lastReading.z = pdr->z; priv->lastReading.buttons = pdr->buttons; - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c index 8976cceb..f2222898 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c @@ -27,7 +27,7 @@ #define Z_MIN 0 #define Z_MAX 1 -static bool_t MouseInit(GMouse* m, unsigned driverinstance) +static gBool MouseInit(GMouse* m, unsigned driverinstance) { const uint8_t *p; @@ -46,7 +46,7 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) }; if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); for (p = commandList; p < commandList+sizeof(commandList); p += 2) @@ -60,15 +60,15 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) aquire_bus(m); if (write_command(m, MAX11802_CMD_MODE_RD, 0) != MAX11802_MODE) { release_bus(m); - return FALSE; + return gFalse; } release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { uint8_t readyCount; uint8_t notReadyCount; @@ -126,7 +126,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) // Has it been too long? If so give up if (++notReadyCount >= 5) { - return FALSE; + return gFalse; } // Give up the time slice to someone else and then try again @@ -149,7 +149,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) // Was there a valid touch? if (((pdr->x | pdr->y) & 0x03) != 0x0) { pdr->z = Z_MIN; - return TRUE; + return gTrue; } // Strip the tags (we need to take care because coord_t is signed - and sign bit gets extended on shift!) @@ -157,7 +157,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) pdr->y = (uint16_t)(pdr->y) >> 4; pdr->z = Z_MAX; - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h index e5339815..cf663cb0 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802_board_template.h @@ -22,9 +22,9 @@ /** * Init the board * - * Returns TRUE on success, FALSE on failure + * Returns gTrue on success, gFalse on failure */ -static GFXINLINE bool_t init_board(GMouse* m, unsigned driverinstance) { +static GFXINLINE gBool init_board(GMouse* m, unsigned driverinstance) { } diff --git a/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h b/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h index 440d81fe..bc2917ad 100644 --- a/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h +++ b/drivers/ginput/touch/MCU/gmouse_lld_MCU_board_template.h @@ -23,10 +23,10 @@ // How much extra data to allocate at the end of the GMouse structure for the board's use #define GMOUSE_MCU_BOARD_DATA_SIZE 0 -static bool_t init_board(GMouse *m, unsigned driverinstance) { +static gBool init_board(GMouse *m, unsigned driverinstance) { } -static bool_t read_xyz(GMouse *m, GMouseReading *prd) { +static gBool read_xyz(GMouse *m, GMouseReading *prd) { } #endif /* _LLD_GMOUSE_MCU_BOARD_H */ diff --git a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c index d79da2a2..53b167bb 100644 --- a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c +++ b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c @@ -19,16 +19,16 @@ coord_t qwidgetMouseY; coord_t qwidgetMouseZ; uint16_t qwidgetMouseButtons; -static bool_t _init(GMouse* m, unsigned driverinstance) +static gBool _init(GMouse* m, unsigned driverinstance) { (void)driverinstance; qwidgetMouse = m; - return TRUE; + return gTrue; } -static bool_t _read(GMouse* m, GMouseReading* pdr) +static gBool _read(GMouse* m, GMouseReading* pdr) { (void)m; @@ -37,7 +37,7 @@ static bool_t _read(GMouse* m, GMouseReading* pdr) pdr->z = qwidgetMouseZ; pdr->buttons = qwidgetMouseButtons; - return TRUE; + return gTrue; } const GMouseVMT GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c index 896074b9..eab13de4 100644 --- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c +++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c @@ -57,9 +57,9 @@ * The settling times. We have set these conservatively at 1ms. * The reading window. We set this to 16 just to reduce noise. High-res panels may need a lower value. */ -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -95,10 +95,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, STMPE610_REG_INT_CTRL, 0x01); // Level interrupt, enable interrupts release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { #if GMOUSE_STMPE610_TEST_MODE static GMouseReading n; @@ -133,14 +133,14 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE610_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } #else // Is there a new sample or a touch transition #if GMOUSE_STMPE610_GPIO_IRQPIN if(!getpin_irq(m)) - return FALSE; + return gFalse; #endif // Is there something in the fifo @@ -157,7 +157,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE610_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } // No new result @@ -165,7 +165,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE610_REG_INT_STA, 0xFF); #endif release_bus(m); - return FALSE; + return gFalse; } #endif @@ -229,7 +229,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) #endif #endif - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h index 14917e53..a821ee7c 100644 --- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h +++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h @@ -33,11 +33,11 @@ // If GFXON this is a really slow CPU and we should always clear the FIFO between reads. #define GMOUSE_STMPE610_SLOW_CPU GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } #if GMOUSE_STMPE610_GPIO_IRQPIN - static bool_t getpin_irq(GMouse* m) { + static gBool getpin_irq(GMouse* m) { } #endif diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c index 90496b29..fe978828 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c @@ -57,9 +57,9 @@ * The settling times. We have set these conservatively at 1ms. * The reading window. We set this to 16 just to reduce noise. High-res panels may need a lower value. */ -static bool_t MouseInit(GMouse* m, unsigned driverinstance) { +static gBool MouseInit(GMouse* m, unsigned driverinstance) { if (!init_board(m, driverinstance)) - return FALSE; + return gFalse; aquire_bus(m); @@ -95,10 +95,10 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { write_reg(m, STMPE811_REG_INT_CTRL, 0x01); // Level interrupt, enable interrupts release_bus(m); - return TRUE; + return gTrue; } -static bool_t read_xyz(GMouse* m, GMouseReading* pdr) +static gBool read_xyz(GMouse* m, GMouseReading* pdr) { #if GMOUSE_STMPE811_TEST_MODE static GMouseReading n; @@ -133,14 +133,14 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE811_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } #else // Is there a new sample or a touch transition #if GMOUSE_STMPE811_GPIO_IRQPIN if(!getpin_irq(m)) - return FALSE; + return gFalse; #endif // Is there something in the fifo @@ -157,7 +157,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE811_REG_INT_STA, 0xFF); #endif release_bus(m); - return TRUE; + return gTrue; } // No new result @@ -165,7 +165,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) write_reg(m, STMPE811_REG_INT_STA, 0xFF); #endif release_bus(m); - return FALSE; + return gFalse; } #endif @@ -228,7 +228,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) #endif #endif - return TRUE; + return gTrue; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h index fb979f8b..dfe44ed7 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h @@ -33,11 +33,11 @@ // If GFXON this is a really slow CPU and we should always clear the FIFO between reads. #define GMOUSE_STMPE811_SLOW_CPU GFXOFF -static bool_t init_board(GMouse* m, unsigned driverinstance) { +static gBool init_board(GMouse* m, unsigned driverinstance) { } #if GMOUSE_STMPE811_GPIO_IRQPIN - static bool_t getpin_irq(GMouse* m) { + static gBool getpin_irq(GMouse* m) { } #endif diff --git a/drivers/multiple/SDL/gdisp_lld_SDL.c b/drivers/multiple/SDL/gdisp_lld_SDL.c index 5e2661a3..3ea2168f 100644 --- a/drivers/multiple/SDL/gdisp_lld_SDL.c +++ b/drivers/multiple/SDL/gdisp_lld_SDL.c @@ -40,8 +40,8 @@ #include "../../../src/ginput/ginput_driver_mouse.h" // Forward definitions - static bool_t SDL_MouseInit(GMouse *m, unsigned driverinstance); - static bool_t SDL_MouseRead(GMouse *m, GMouseReading *prd); + static gBool SDL_MouseInit(GMouse *m, unsigned driverinstance); + static gBool SDL_MouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT GMOUSE_DRIVER_VMT[1] = {{ { GDRIVER_TYPE_MOUSE, @@ -78,7 +78,7 @@ #include "../../../src/ginput/ginput_driver_keyboard.h" // Forward definitions - static bool_t SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance); + static gBool SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance); static int SDL_KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz); const GKeyboardVMT GKEYBOARD_DRIVER_VMT[1] = {{ @@ -366,7 +366,7 @@ void sdl_driver_init (void) { } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { g->board = 0; // No board interface for this driver #if GINPUT_NEED_MOUSE @@ -380,7 +380,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; - return TRUE; + return gTrue; } @@ -433,29 +433,29 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) #endif #if GINPUT_NEED_MOUSE - static bool_t SDL_MouseInit(GMouse *m, unsigned driverinstance) { + static gBool SDL_MouseInit(GMouse *m, unsigned driverinstance) { mouse = m; (void) driverinstance; - return TRUE; + return gTrue; } - static bool_t SDL_MouseRead(GMouse *m, GMouseReading *pt) { + static gBool SDL_MouseRead(GMouse *m, GMouseReading *pt) { (void) m; if (!context) - return FALSE; + return gFalse; pt->x = context->mousex; pt->y = context->mousey; pt->z = (context->buttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0; pt->buttons = context->buttons; - return TRUE; + return gTrue; } #endif /* GINPUT_NEED_MOUSE */ #if GINPUT_NEED_KEYBOARD - static bool_t SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance) { + static gBool SDL_KeyboardInit(GKeyboard *k, unsigned driverinstance) { keyboard = k; (void) driverinstance; - return TRUE; + return gTrue; } static int SDL_KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz) { diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index 10818269..86af1d80 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -96,8 +96,8 @@ #include "../../../src/ginput/ginput_driver_mouse.h" // Forward definitions - static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance); - static bool_t Win32MouseRead(GMouse *m, GMouseReading *prd); + static gBool Win32MouseInit(GMouse *m, unsigned driverinstance); + static gBool Win32MouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { @@ -390,7 +390,7 @@ #endif // Forward definitions - static bool_t Win32KeyboardInit(GKeyboard *k, unsigned driverinstance); + static gBool Win32KeyboardInit(GKeyboard *k, unsigned driverinstance); static int Win32KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz); const GKeyboardVMT const GKEYBOARD_DRIVER_VMT[1] = {{ @@ -420,7 +420,7 @@ #endif static DWORD winThreadId; -static volatile bool_t QReady; +static volatile gBool QReady; static HANDLE drawMutex; static HWND hWndParent = 0; @@ -445,7 +445,7 @@ typedef struct winPriv { coord_t mousex, mousey; uint16_t mousebuttons; GMouse *mouse; - bool_t mouseenabled; + gBool mouseenabled; void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y); #endif #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE @@ -472,7 +472,7 @@ void gfxEmulatorSetParentWindow(void *hwnd) { if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL)) // For normal setup this is always true _gmouseWakeup(priv->mouse); } - void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled) { + void gfxEmulatorMouseEnable(GDisplay *g, gBool enabled) { ((winPriv *)g->priv)->mouseenabled = enabled; } void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y)) { @@ -761,7 +761,7 @@ static DWORD WINAPI WindowThread(void *param) { // Establish this thread as a message queue thread winThreadId = GetCurrentThreadId(); PeekMessage(&msg, 0, WM_USER, WM_USER, PM_NOREMOVE); - QReady = TRUE; + QReady = gTrue; // Create the window class { @@ -825,7 +825,7 @@ static DWORD WINAPI WindowThread(void *param) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { winPriv * priv; char buf[132]; @@ -838,7 +838,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { // Create the thread if (!(hth = CreateThread(0, 0, WindowThread, 0, CREATE_SUSPENDED, 0))) - return FALSE; + return gFalse; SetThreadPriority(hth, THREAD_PRIORITY_ABOVE_NORMAL); ResumeThread(hth); CloseHandle(hth); @@ -884,7 +884,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { // Create the associated mouse #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE - priv->mouseenabled = hWndParent ? FALSE : TRUE; + priv->mouseenabled = hWndParent ? gFalse : gTrue; priv->mouse = (GMouse *)gdriverRegister((const GDriverVMT const *)GMOUSE_DRIVER_VMT, g); #endif @@ -893,7 +893,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { ShowWindow(priv->hwnd, SW_SHOW); UpdateWindow(priv->hwnd); - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH @@ -1551,12 +1551,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { #endif #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE - static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance) { + static gBool Win32MouseInit(GMouse *m, unsigned driverinstance) { (void) m; (void) driverinstance; - return TRUE; + return gTrue; } - static bool_t Win32MouseRead(GMouse *m, GMouseReading *pt) { + static gBool Win32MouseRead(GMouse *m, GMouseReading *pt) { GDisplay * g; winPriv * priv; @@ -1595,20 +1595,20 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { } #endif - return TRUE; + return gTrue; } #endif /* GINPUT_NEED_MOUSE */ #if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD - static bool_t Win32KeyboardInit(GKeyboard *k, unsigned driverinstance) { + static gBool Win32KeyboardInit(GKeyboard *k, unsigned driverinstance) { (void) driverinstance; // Only one please if (keyboard) - return FALSE; + return gFalse; keyboard = k; - return TRUE; + return gTrue; } static int Win32KeyboardGetData(GKeyboard *k, uint8_t *pch, int sz) { diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h index 710cd3fb..c95b554a 100644 --- a/drivers/multiple/Win32/gdisp_lld_config.h +++ b/drivers/multiple/Win32/gdisp_lld_config.h @@ -58,7 +58,7 @@ void gfxEmulatorSetParentWindow(void *hwnd); void gfxEmulatorMouseInject(GDisplay *g, uint16_t buttons, coord_t x, coord_t y); // This function enables you to turn on/off normal mouse functions on a ugfx Win32 display window. - void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled); + void gfxEmulatorMouseEnable(GDisplay *g, gBool enabled); // This function enables you to capture mouse events on a ugfx Win32 display window. // Passing NULL turns off the capture diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index f27795a8..05e80614 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -59,8 +59,8 @@ #include "../../../src/ginput/ginput_driver_mouse.h" // Forward definitions - static bool_t XMouseInit(GMouse *m, unsigned driverinstance); - static bool_t XMouseRead(GMouse *m, GMouseReading *prd); + static gBool XMouseInit(GMouse *m, unsigned driverinstance); + static gBool XMouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { @@ -140,7 +140,7 @@ #endif // Forward definitions - static bool_t XKeyboardInit(GKeyboard *k, unsigned driverinstance); + static gBool XKeyboardInit(GKeyboard *k, unsigned driverinstance); static int XKeyboardGetData(GKeyboard *k, uint8_t *pch, int sz); const GKeyboardVMT const GKEYBOARD_DRIVER_VMT[1] = {{ @@ -167,7 +167,7 @@ static GKeyboard *keyboard; #endif -static bool_t initdone; +static gBool initdone; static Display *dis; static int scr; static XEvent evt; @@ -294,7 +294,7 @@ static int FatalXIOError(Display *d) { exit(0); } -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { XSizeHints *pSH; XSetWindowAttributes xa; XTextProperty WindowTitle; @@ -304,7 +304,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { if (!initdone) { gfxThreadHandle hth; - initdone = TRUE; + initdone = gTrue; #if GFX_USE_OS_LINUX || GFX_USE_OS_OSX XInitThreads(); #endif @@ -319,7 +319,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { if (!XMatchVisualInfo(dis, scr, 24, TrueColor, &vis)) { fprintf(stderr, "Your display has no TrueColor mode\n"); XCloseDisplay(dis); - return FALSE; + return gFalse; } cmap = XCreateColormap(dis, RootWindow(dis, scr), vis.visual, AllocNone); @@ -404,7 +404,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; - return TRUE; + return gTrue; } LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) @@ -480,12 +480,12 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) #endif #if GINPUT_NEED_MOUSE - static bool_t XMouseInit(GMouse *m, unsigned driverinstance) { + static gBool XMouseInit(GMouse *m, unsigned driverinstance) { (void) m; (void) driverinstance; - return TRUE; + return gTrue; } - static bool_t XMouseRead(GMouse *m, GMouseReading *pt) { + static gBool XMouseRead(GMouse *m, GMouseReading *pt) { xPriv * priv; priv = m->display->priv; @@ -493,20 +493,20 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) pt->y = priv->mousey; pt->z = (priv->buttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0; pt->buttons = priv->buttons; - return TRUE; + return gTrue; } #endif /* GINPUT_NEED_MOUSE */ #if GINPUT_NEED_KEYBOARD - static bool_t XKeyboardInit(GKeyboard *k, unsigned driverinstance) { + static gBool XKeyboardInit(GKeyboard *k, unsigned driverinstance) { (void) driverinstance; // Only one please if (keyboard) - return FALSE; + return gFalse; keyboard = k; - return TRUE; + return gTrue; } static int XKeyboardGetData(GKeyboard *k, uint8_t *pch, int sz) { diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index bb8ffbe6..653b75c4 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -42,8 +42,8 @@ #include "../../../src/ginput/ginput_driver_mouse.h" // Forward definitions - static bool_t NMouseInit(GMouse *m, unsigned driverinstance); - static bool_t NMouseRead(GMouse *m, GMouseReading *prd); + static gBool NMouseInit(GMouse *m, unsigned driverinstance); + static gBool NMouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { @@ -182,9 +182,9 @@ static gfxThreadHandle hThread; * Send a whole packet of data. * Len is specified in the number of uint16_t's we want to send as our protocol only talks uint16_t's. * Note that contents of the packet are modified to ensure it will cross the wire in the correct format. - * If the connection closes before we send all the data - the call returns FALSE. + * If the connection closes before we send all the data - the call returns gFalse. */ -static bool_t sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) { +static gBool sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) { int i; // Convert each uint16_t to network order @@ -196,7 +196,7 @@ static bool_t sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) { return send(netfd, (const char *)pkt, len, 0) == len; } -static bool_t newconnection(SOCKET_TYPE clientfd) { +static gBool newconnection(SOCKET_TYPE clientfd) { GDisplay * g; netPriv * priv; @@ -213,7 +213,7 @@ static bool_t newconnection(SOCKET_TYPE clientfd) { // Was anything found? if (!g) - return FALSE; + return gFalse; // Reset the priv area priv = g->priv; @@ -240,13 +240,13 @@ static bool_t newconnection(SOCKET_TYPE clientfd) { // Send a redraw all #if GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER gdispGClear(g, gwinGetDefaultBgColor()); - gwinRedrawDisplay(g, FALSE); + gwinRedrawDisplay(g, gFalse); #endif - return TRUE; + return gTrue; } -static bool_t rxdata(SOCKET_TYPE fd) { +static gBool rxdata(SOCKET_TYPE fd) { GDisplay * g; netPriv * priv; int len; @@ -269,7 +269,7 @@ static bool_t rxdata(SOCKET_TYPE fd) { // The higher level is still processing the previous data. // Give it a chance to run by coming back to this data. gfxSleepMilliseconds(1); - return TRUE; + return gTrue; } /* handle data from a client */ @@ -278,14 +278,14 @@ static bool_t rxdata(SOCKET_TYPE fd) { // Socket closed or in error state MUTEX_EXIT; g->flags &= ~GDISP_FLG_CONNECTED; - return FALSE; + return gFalse; } MUTEX_EXIT; // Do we have a full reply yet priv->databytes += len; if (priv->databytes < sizeof(priv->data)) - return TRUE; + return gTrue; priv->databytes = 0; // Convert network byte or to host byte order @@ -315,7 +315,7 @@ static bool_t rxdata(SOCKET_TYPE fd) { // Just ignore unrecognised data break; } - return TRUE; + return gTrue; } static DECLARE_THREAD_STACK(waNetThread, 512); @@ -429,7 +429,7 @@ static DECLARE_THREAD_FUNCTION(NetThread, param) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { netPriv * priv; // Initialise the receiver thread (if it hasn't been done already) @@ -459,7 +459,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH @@ -636,7 +636,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { LLDSPEC void gdisp_lld_control(GDisplay *g) { netPriv * priv; uint16_t buf[3]; - bool_t allgood; + gBool allgood; #if GDISP_DONT_WAIT_FOR_NET_DISPLAY if (!(g->flags & GDISP_FLG_CONNECTED)) @@ -680,7 +680,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { gfxSleepMilliseconds(1); // Extract the return status - allgood = priv->data[1] ? TRUE : FALSE; + allgood = priv->data[1] ? gTrue : gFalse; g->flags &= ~GDISP_FLG_HAVEDATA; // Do nothing more if the operation failed @@ -716,12 +716,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { #endif #if GINPUT_NEED_MOUSE - static bool_t NMouseInit(GMouse *m, unsigned driverinstance) { + static gBool NMouseInit(GMouse *m, unsigned driverinstance) { (void) m; (void) driverinstance; - return TRUE; + return gTrue; } - static bool_t NMouseRead(GMouse *m, GMouseReading *pt) { + static gBool NMouseRead(GMouse *m, GMouseReading *pt) { GDisplay * g; netPriv * priv; @@ -732,7 +732,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { pt->y = priv->mousey; pt->z = (priv->mousebuttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0; pt->buttons = priv->mousebuttons; - return TRUE; + return gTrue; } #endif /* GINPUT_NEED_MOUSE */ diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp index dc208cbe..8df5e08d 100644 --- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp +++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp @@ -34,7 +34,7 @@ static WiFiServer server(GDISP_GFXNET_PORT); static GTimer poller; -static bool_t uGFXInitDone; +static gBool uGFXInitDone; #ifndef GDISP_GFXNET_WIFI_INIT_FUNCTION #define GDISP_GFXNET_WIFI_INIT_FUNCTION uGFXnetArduinoWifiInit @@ -62,8 +62,8 @@ static bool_t uGFXInitDone; #include "../../../src/ginput/ginput_driver_mouse.h" // Forward definitions - static bool_t NMouseInit(GMouse *m, unsigned driverinstance); - static bool_t NMouseRead(GMouse *m, GMouseReading *prd); + static gBool NMouseInit(GMouse *m, unsigned driverinstance); + static gBool NMouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { @@ -150,9 +150,9 @@ static void endcon(GDisplay *g) { * Send a whole packet of data. * Len is specified in the number of uint16_t's we want to send as our protocol only talks uint16_t's. * Note that contents of the packet are modified to ensure it will cross the wire in the correct format. - * If the connection closes before we send all the data - the call returns FALSE. + * If the connection closes before we send all the data - the call returns gFalse. */ -static bool_t sendpkt(CLIENTFD fd, uint16_t *pkt, int len) { +static gBool sendpkt(CLIENTFD fd, uint16_t *pkt, int len) { // Convert each uint16_t to network order #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE { @@ -284,7 +284,7 @@ void uGFXnetClientPoller(void *param) { // Send a redraw all #if GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER gdispGClear(g, gwinGetDefaultBgColor()); - gwinRedrawDisplay(g, FALSE); + gwinRedrawDisplay(g, gFalse); #endif break; } @@ -307,7 +307,7 @@ void uGFXnetClientPoller(void *param) { /* Driver exported functions. */ /*===========================================================================*/ -LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { +LLDSPEC gBool gdisp_lld_init(GDisplay *g) { netPriv * priv; // Initialise the receiver thread (if it hasn't been done already) @@ -318,8 +318,8 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { // Initialise the poller gtimerInit(&poller); - gtimerStart(&poller, uGFXnetClientPoller, 0, TRUE, 50); - uGFXInitDone = TRUE; + gtimerStart(&poller, uGFXnetClientPoller, 0, gTrue, 50); + uGFXInitDone = gTrue; } // Create a private area for this window @@ -342,7 +342,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; - return TRUE; + return gTrue; } #if GDISP_HARDWARE_FLUSH @@ -519,7 +519,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { LLDSPEC void gdisp_lld_control(GDisplay *g) { netPriv * priv; uint16_t buf[3]; - bool_t allgood; + gBool allgood; #if GDISP_DONT_WAIT_FOR_NET_DISPLAY if (!(g->flags & GDISP_FLG_CONNECTED)) @@ -563,7 +563,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { gfxSleepMilliseconds(1); // Extract the return status - allgood = priv->data[1] ? TRUE : FALSE; + allgood = priv->data[1] ? gTrue : gFalse; g->flags &= ~GDISP_FLG_HAVEDATA; // Do nothing more if the operation failed @@ -599,12 +599,12 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { #endif #if GINPUT_NEED_MOUSE - static bool_t NMouseInit(GMouse *m, unsigned driverinstance) { + static gBool NMouseInit(GMouse *m, unsigned driverinstance) { (void) m; (void) driverinstance; - return TRUE; + return gTrue; } - static bool_t NMouseRead(GMouse *m, GMouseReading *pt) { + static gBool NMouseRead(GMouse *m, GMouseReading *pt) { GDisplay * g; netPriv * priv; @@ -615,7 +615,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { pt->y = priv->mousey; pt->z = (priv->mousebuttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0; pt->buttons = priv->mousebuttons; - return TRUE; + return gTrue; } #endif /* GINPUT_NEED_MOUSE */ |