From d9f02858fdc04c4404834a033850f758e4c8ee7e Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 21 Dec 2013 13:21:59 +1000 Subject: [PATCH] Replace NULL's with 0 as NULL is not defined by the Raw32 GOS. --- .../gdisp/board_HX8347D_stm32f4discovery.h | 14 ++--- .../gdisp/board_SSD1289_stm32f4discovery.h | 12 ++-- boards/addons/gdisp/board_SSD1306_i2c.h | 4 +- boards/addons/gdisp/board_SSD1306_spi.h | 2 +- ...ginput_lld_mouse_board_olimex_stm32_e407.h | 2 +- ...put_lld_mouse_board_st_stm32f4_discovery.h | 2 +- .../Embest-STM32-DMSTF4BB/board_SSD2119.h | 12 ++-- .../ginput_lld_mouse_board.h | 4 +- .../ginput_lld_mouse_board.h | 2 +- boards/base/Marlin/ginput_lld_mouse_board.h | 4 +- .../ChibiOS_Board/flash_memory.c | 2 +- .../ginput_lld_mouse_board.h | 6 +- .../board_Nokia6610GE12.h | 4 +- .../Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h | 4 +- .../Olimex-STM32-LCD/ginput_lld_mouse_board.h | 10 ++-- demos/benchmarks/main.c | 2 +- demos/modules/gtimer/main.c | 4 +- demos/modules/gwin/basic/main.c | 4 +- demos/modules/gwin/button/main.c | 2 +- demos/modules/gwin/checkbox/main.c | 2 +- demos/modules/gwin/console/main.c | 6 +- demos/modules/gwin/list/main.c | 2 +- demos/modules/gwin/radio/main.c | 12 ++-- demos/modules/gwin/slider/main.c | 4 +- demos/modules/gwin/widgets/main.c | 58 +++++++++---------- drivers/gadc/AT91SAM7/gadc_lld.c | 2 +- drivers/multiple/X/gdisp_lld_X.c | 2 +- include/gos/chibios.h | 2 +- include/gos/win32.h | 8 +-- src/gadc/gadc.c | 6 +- src/gaudin/gaudin.c | 2 +- src/gdisp/fonts.c | 2 +- src/gos/chibios.c | 2 +- src/gos/osx.c | 2 +- src/gos/win32.c | 6 +- src/gqueue/gqueue.c | 6 +- src/gtimer/gtimer.c | 4 +- 37 files changed, 112 insertions(+), 112 deletions(-) diff --git a/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h b/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h index df287477..f486841b 100644 --- a/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h +++ b/boards/addons/gdisp/board_HX8347D_stm32f4discovery.h @@ -28,12 +28,12 @@ static const PWMConfig pwmcfg = { 1000000, /* 1 MHz PWM clock frequency. */ 100, /* PWM period is 100 cycles. */ - NULL, + 0, { - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL} + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0} }, 0 }; @@ -44,7 +44,7 @@ static const PWMConfig pwmcfg = { * The slave select line is the pin 4 on the port GPIOA. */ static const SPIConfig spi1cfg_8bit = { - NULL, + 0, /* HW dependent part.*/ GPIOA, 4, @@ -57,7 +57,7 @@ static const SPIConfig spi1cfg_8bit = { * The slave select line is the pin 4 on the port GPIOA. */ static const SPIConfig spi1cfg_16bit = { - NULL, + 0, /* HW dependent part.*/ GPIOA, 4, diff --git a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h index 866311dc..1d86a67e 100644 --- a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h +++ b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h @@ -24,12 +24,12 @@ static const PWMConfig pwmcfg = { 100000, /* 100 kHz PWM clock frequency. */ 100, /* PWM period is 100 cycles. */ - NULL, + 0, { - {PWM_OUTPUT_DISABLED, NULL}, - {PWM_OUTPUT_DISABLED, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_DISABLED, NULL} + {PWM_OUTPUT_DISABLED, 0}, + {PWM_OUTPUT_DISABLED, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_DISABLED, 0} }, 0 }; @@ -61,7 +61,7 @@ static inline void init_board(GDisplay *g) { rccEnableAHB3(RCC_AHB3ENR_FSMCEN, 0); #if defined(GDISP_USE_DMA) - if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, NULL, NULL)) gfxExit(); + if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, 0, 0)) gfxExit(); dmaStreamSetMemory0(GDISP_DMA_STREAM, &GDISP_RAM); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); #else diff --git a/boards/addons/gdisp/board_SSD1306_i2c.h b/boards/addons/gdisp/board_SSD1306_i2c.h index 449d47ba..3f755f26 100644 --- a/boards/addons/gdisp/board_SSD1306_i2c.h +++ b/boards/addons/gdisp/board_SSD1306_i2c.h @@ -112,7 +112,7 @@ static inline void write_cmd(GDisplay *g, uint8_t cmd) { command[1] = cmd; i2cStart(&I2CD1, &i2cconfig); - i2cMasterTransmitTimeout(&I2CD1, SSD1306_I2C_ADDRESS, command, 2, NULL, 0, MS2ST(10)); + i2cMasterTransmitTimeout(&I2CD1, SSD1306_I2C_ADDRESS, command, 2, 0, 0, MS2ST(10)); i2cStop(&I2CD1); } @@ -120,7 +120,7 @@ static inline void write_data(GDisplay *g, uint8_t* data, uint16_t length) { (void) g; i2cStart(&I2CD1, &i2cconfig); - i2cMasterTransmitTimeout(&I2CD1, SSD1306_I2C_ADDRESS, data, length, NULL, 0, MS2ST(10)); + i2cMasterTransmitTimeout(&I2CD1, SSD1306_I2C_ADDRESS, data, length, 0, 0, MS2ST(10)); i2cStop(&I2CD1); } diff --git a/boards/addons/gdisp/board_SSD1306_spi.h b/boards/addons/gdisp/board_SSD1306_spi.h index 21bf095f..b476fec0 100644 --- a/boards/addons/gdisp/board_SSD1306_spi.h +++ b/boards/addons/gdisp/board_SSD1306_spi.h @@ -37,7 +37,7 @@ * The slave select line is the pin 4 on the port GPIOA. */ static const SPIConfig spi1config = { - NULL, + 0, /* HW dependent part.*/ SSD1306_MISO_PORT, SSD1306_MISO_PIN, diff --git a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h index e0ab85dc..73507f10 100644 --- a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h +++ b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h @@ -18,7 +18,7 @@ #define _GINPUT_LLD_MOUSE_BOARD_H static const SPIConfig spicfg = { - NULL, + 0, GPIOG, 10, /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0, diff --git a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h index 919b767d..d4923c29 100644 --- a/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h +++ b/boards/addons/ginput/touch/ADS7843/ginput_lld_mouse_board_st_stm32f4_discovery.h @@ -20,7 +20,7 @@ * Note that you can tweak the SPI bus speed */ static const SPIConfig spicfg = { - NULL, + 0, GPIOC, 4, /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0, diff --git a/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h b/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h index c6d3d040..d6e10a61 100644 --- a/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h +++ b/boards/base/Embest-STM32-DMSTF4BB/board_SSD2119.h @@ -31,12 +31,12 @@ static const PWMConfig pwmcfg = { 1000000, /* 1 MHz PWM clock frequency. */ 100, /* PWM period is 100 cycles. */ - NULL, + 0, { - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL} + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0} }, 0 }; @@ -53,7 +53,7 @@ static inline void init_board(GDisplay *g) { rccEnableAHB3(RCC_AHB3ENR_FSMCEN, 0); #if defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM) - if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, NULL, NULL)) + if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, 0, 0)) gfxExit(); dmaStreamSetMemory0(GDISP_DMA_STREAM, &GDISP_RAM); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); diff --git a/boards/base/Embest-STM32-DMSTF4BB/ginput_lld_mouse_board.h b/boards/base/Embest-STM32-DMSTF4BB/ginput_lld_mouse_board.h index 6eff87c9..d525e268 100644 --- a/boards/base/Embest-STM32-DMSTF4BB/ginput_lld_mouse_board.h +++ b/boards/base/Embest-STM32-DMSTF4BB/ginput_lld_mouse_board.h @@ -38,11 +38,11 @@ static void write_reg(uint8_t reg, uint8_t n, uint16_t val) if (n == 1) { txbuf[1] = val; - i2cMasterTransmitTimeout(&I2CD1, STMPE811_ADDR, txbuf, 2, NULL, 0, MS2ST(STMPE811_TIMEOUT)); + i2cMasterTransmitTimeout(&I2CD1, STMPE811_ADDR, txbuf, 2, 0, 0, MS2ST(STMPE811_TIMEOUT)); } else if (n == 2) { txbuf[1] = ((val & 0xFF00) >> 8); txbuf[2] = (val & 0x00FF); - i2cMasterTransmitTimeout(&I2CD1, STMPE811_ADDR, txbuf, 3, NULL, 0, MS2ST(STMPE811_TIMEOUT)); + i2cMasterTransmitTimeout(&I2CD1, STMPE811_ADDR, txbuf, 3, 0, 0, MS2ST(STMPE811_TIMEOUT)); } i2cReleaseBus(&I2CD1); diff --git a/boards/base/FireBull-STM32F103-FB/ginput_lld_mouse_board.h b/boards/base/FireBull-STM32F103-FB/ginput_lld_mouse_board.h index 102bd834..6ca1a897 100644 --- a/boards/base/FireBull-STM32F103-FB/ginput_lld_mouse_board.h +++ b/boards/base/FireBull-STM32F103-FB/ginput_lld_mouse_board.h @@ -9,7 +9,7 @@ #define _GINPUT_LLD_MOUSE_BOARD_H static const SPIConfig spicfg = { - NULL, + 0, GPIOC, 6, /* SPI_CR1_BR_2 |*/ SPI_CR1_BR_1 | SPI_CR1_BR_0, diff --git a/boards/base/Marlin/ginput_lld_mouse_board.h b/boards/base/Marlin/ginput_lld_mouse_board.h index e3e18c24..d787d224 100644 --- a/boards/base/Marlin/ginput_lld_mouse_board.h +++ b/boards/base/Marlin/ginput_lld_mouse_board.h @@ -52,11 +52,11 @@ static void write_reg(uint8_t reg, uint8_t n, uint16_t val) { if (n == 1) { txbuf[1] = val; - i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 2, NULL, 0, MS2ST(FT5x06_TIMEOUT)); + i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 2, 0, 0, MS2ST(FT5x06_TIMEOUT)); } else if (n == 2) { txbuf[1] = ((val & 0xFF00) >> 8); txbuf[2] = (val & 0x00FF); - i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 3, NULL, 0, MS2ST(FT5x06_TIMEOUT)); + i2cMasterTransmitTimeout(&I2CD2, FT5x06_ADDR, txbuf, 3, 0, 0, MS2ST(FT5x06_TIMEOUT)); } i2cReleaseBus(&I2CD2); diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/flash_memory.c b/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/flash_memory.c index a27a3db5..ccd3ab9f 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/flash_memory.c +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/flash_memory.c @@ -12,7 +12,7 @@ static const unsigned short _SERIAL_FLASH_CMD_WRSR = 0x01; static const unsigned short _SERIAL_FLASH_CMD_SER = 0xD8; //25P80 static const SPIConfig flash_spicfg = { - NULL, + 0, GPIOD, GPIOD_FLASH_CS, 0 diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h b/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h index 9c659e66..7e9948a5 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h @@ -19,8 +19,8 @@ static const ADCConversionGroup adcgrpcfg = { FALSE, ADC_NUM_CHANNELS, - NULL, - NULL, + 0, + 0, /* HW dependent part.*/ 0, ADC_CR2_SWSTART, @@ -37,7 +37,7 @@ static const ADCConversionGroup adcgrpcfg = { * @notapi */ static inline void init_board(void) { - adcStart(&ADCD1, NULL); + adcStart(&ADCD1, 0); } /** diff --git a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h index feb1887e..f6c73a14 100644 --- a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h +++ b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h @@ -51,9 +51,9 @@ static volatile AT91PS_PDC pPDC = AT91C_BASE_PDC_SPI0; static const PWMConfig pwmcfg = { 1000000, /* 1 MHz PWM clock frequency. Ignored as we are using PWM_MCK_DIV_n */ 1000, /* PWM period is 1000 cycles. */ - NULL, + 0, { - {PWM_MCK_DIV_1 | PWM_OUTPUT_ACTIVE_HIGH | PWM_OUTPUT_PIN1 | PWM_DISABLEPULLUP_PIN1, NULL}, + {PWM_MCK_DIV_1 | PWM_OUTPUT_ACTIVE_HIGH | PWM_OUTPUT_PIN1 | PWM_DISABLEPULLUP_PIN1, 0}, }, }; diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h index c88dbe74..aa907058 100644 --- a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h +++ b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h @@ -51,9 +51,9 @@ static volatile AT91PS_PDC pPDC = AT91C_BASE_PDC_SPI0; static const PWMConfig pwmcfg = { 1000000, /* 1 MHz PWM clock frequency. Ignored as we are using PWM_MCK_DIV_n */ 1000, /* PWM period is 1000 cycles. */ - NULL, + 0, { - {PWM_MCK_DIV_1 | PWM_OUTPUT_ACTIVE_HIGH | PWM_OUTPUT_PIN1 | PWM_DISABLEPULLUP_PIN1, NULL}, + {PWM_MCK_DIV_1 | PWM_OUTPUT_ACTIVE_HIGH | PWM_OUTPUT_PIN1 | PWM_DISABLEPULLUP_PIN1, 0}, }, }; diff --git a/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_board.h b/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_board.h index 4fcffd25..91575527 100644 --- a/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_board.h +++ b/boards/base/Olimex-STM32-LCD/ginput_lld_mouse_board.h @@ -14,8 +14,8 @@ static const ADCConversionGroup adc_y_config = { FALSE, ADC_NUM_CHANNELS, - NULL, - NULL, + 0, + 0, 0, 0, 0, 0, ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS), @@ -26,8 +26,8 @@ static const ADCConversionGroup adc_y_config = { static const ADCConversionGroup adc_x_config = { FALSE, ADC_NUM_CHANNELS, - NULL, - NULL, + 0, + 0, 0, 0, 0, 0, ADC_SQR1_NUM_CH(ADC_NUM_CHANNELS), @@ -36,7 +36,7 @@ static const ADCConversionGroup adc_x_config = { }; static inline void init_board(void) { - adcStart(&ADCD1, NULL); + adcStart(&ADCD1, 0); } static inline void aquire_bus(void) { diff --git a/demos/benchmarks/main.c b/demos/benchmarks/main.c index 344fd375..d8c02338 100644 --- a/demos/benchmarks/main.c +++ b/demos/benchmarks/main.c @@ -41,7 +41,7 @@ static int uitoa(unsigned int value, char * buf, int max) { int i = 0; unsigned int tmp = 0; - if (NULL == buf) + if (!buf) return -3; if (2 > max) diff --git a/demos/modules/gtimer/main.c b/demos/modules/gtimer/main.c index a0ea6aee..89a6bab7 100644 --- a/demos/modules/gtimer/main.c +++ b/demos/modules/gtimer/main.c @@ -51,10 +51,10 @@ int main(void) { gtimerInit(>2); /* continious mode - callback1() called without any argument every 250ms */ - gtimerStart(>1, callback1, NULL, TRUE, 250); + gtimerStart(>1, callback1, 0, TRUE, 250); /* single shot mode - callback2() called without any argument once after 1s */ - gtimerStart(>2, callback2, NULL, FALSE, 1000); + gtimerStart(>2, callback2, 0, FALSE, 1000); while(TRUE) { gfxSleepMilliseconds(500); diff --git a/demos/modules/gwin/basic/main.c b/demos/modules/gwin/basic/main.c index eee22f29..4d8fa33c 100644 --- a/demos/modules/gwin/basic/main.c +++ b/demos/modules/gwin/basic/main.c @@ -44,9 +44,9 @@ int main(void) { GWindowInit wi; wi.show = TRUE; wi.x = 20; wi.y = 10; wi.width = 200; wi.height = 150; - GW1 = gwinWindowCreate(NULL, &wi); + GW1 = gwinWindowCreate(0, &wi); wi.show = TRUE; wi.x = 50; wi.y = 190; wi.width = 150; wi.height = 100; - GW2 = gwinWindowCreate(NULL, &wi); + GW2 = gwinWindowCreate(0, &wi); } /* Set fore- and background colors for both windows */ diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c index f210d84c..6ec8a287 100644 --- a/demos/modules/gwin/button/main.c +++ b/demos/modules/gwin/button/main.c @@ -49,7 +49,7 @@ static void createWidgets(void) { wi.text = "Push Button"; // Create the actual button - ghButton1 = gwinButtonCreate(NULL, &wi); + ghButton1 = gwinButtonCreate(0, &wi); } int main(void) { diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c index 23d3cb17..51f96518 100644 --- a/demos/modules/gwin/checkbox/main.c +++ b/demos/modules/gwin/checkbox/main.c @@ -49,7 +49,7 @@ static void createWidgets(void) { wi.text = "Checkbox"; // Create the actual checkbox - ghCheckbox1 = gwinCheckboxCreate(NULL, &wi); + ghCheckbox1 = gwinCheckboxCreate(0, &wi); } int main(void) { diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c index 0efd1c99..83753c6c 100644 --- a/demos/modules/gwin/console/main.c +++ b/demos/modules/gwin/console/main.c @@ -50,11 +50,11 @@ int main(void) { wi.show = TRUE; wi.x = 0; wi.y = 0; wi.width = gdispGetWidth(); wi.height = gdispGetHeight()/2; - GW1 = gwinConsoleCreate(NULL, &wi); + GW1 = gwinConsoleCreate(0, &wi); wi.y = gdispGetHeight()/2; wi.width = gdispGetWidth()/2; wi.height = gdispGetHeight(); - GW2 = gwinConsoleCreate(NULL, &wi); + GW2 = gwinConsoleCreate(0, &wi); wi.x = gdispGetWidth()/2; wi.height = gdispGetHeight(); - GW3 = gwinConsoleCreate(NULL, &wi); + GW3 = gwinConsoleCreate(0, &wi); } /* Use a special font for GW1 */ diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c index e99c2448..03d99d58 100644 --- a/demos/modules/gwin/list/main.c +++ b/demos/modules/gwin/list/main.c @@ -49,7 +49,7 @@ static void createWidgets(void) { wi.text = "List Name"; // Create the actual list - ghList1 = gwinListCreate(NULL, &wi, FALSE); + ghList1 = gwinListCreate(0, &wi, FALSE); } int main(void) { diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c index b7504535..9287dcf9 100644 --- a/demos/modules/gwin/radio/main.c +++ b/demos/modules/gwin/radio/main.c @@ -47,27 +47,27 @@ static void createWidgets(void) { // create Radio11 wi.g.y = 10; wi.g.x = 10; wi.g.width = 80; wi.g.height = 20; wi.text = "Radio 1"; - ghRadio11 = gwinRadioCreate(NULL, &wi, GROUP1); + ghRadio11 = gwinRadioCreate(0, &wi, GROUP1); // create Radio12 wi.g.y = 50; wi.g.x = 10; wi.g.width = 80; wi.g.height = 20; wi.text = "Radio 2"; - ghRadio12 = gwinRadioCreate(NULL, &wi, GROUP1); + ghRadio12 = gwinRadioCreate(0, &wi, GROUP1); // create Radio13 wi.g.y = 90; wi.g.x = 10; wi.g.width = 80; wi.g.height = 20; wi.text = "Radio 3"; - ghRadio13 = gwinRadioCreate(NULL, &wi, GROUP1); + ghRadio13 = gwinRadioCreate(0, &wi, GROUP1); // create Radio21 wi.g.y = 10; wi.g.x = 120; wi.g.width = 80; wi.g.height = 20; wi.text = "Radio 1"; - ghRadio21 = gwinRadioCreate(NULL, &wi, GROUP2); + ghRadio21 = gwinRadioCreate(0, &wi, GROUP2); // create Radio22 wi.g.y = 50; wi.g.x = 120; wi.g.width = 80; wi.g.height = 20; wi.text = "Radio 2"; - ghRadio22 = gwinRadioCreate(NULL, &wi, GROUP2); + ghRadio22 = gwinRadioCreate(0, &wi, GROUP2); // create Radio23 wi.g.y = 90; wi.g.x = 120; wi.g.width = 80; wi.g.height = 20; wi.text = "Radio 3"; - ghRadio23 = gwinRadioCreate(NULL, &wi, GROUP2); + ghRadio23 = gwinRadioCreate(0, &wi, GROUP2); // Check the first radio buttons gwinRadioPress(ghRadio11); diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c index ed936f12..6e72b447 100644 --- a/demos/modules/gwin/slider/main.c +++ b/demos/modules/gwin/slider/main.c @@ -43,11 +43,11 @@ static void createWidgets(void) { // create Slider1 wi.g.y = 10; wi.g.x = 10; wi.g.width = 200; wi.g.height = 20; wi.text = "S1"; - ghSlider1 = gwinSliderCreate(NULL, &wi); + ghSlider1 = gwinSliderCreate(0, &wi); // create Slider2 wi.g.y = 40; wi.g.x = 10; wi.g.width = 20; wi.g.height = 200; wi.text = "S2"; - ghSlider2 = gwinSliderCreate(NULL, &wi); + ghSlider2 = gwinSliderCreate(0, &wi); } int main(void) { diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index a6d398aa..af2926d7 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -114,58 +114,58 @@ static void createWidgets(void) { // Create the Tabs wi.g.show = TRUE; wi.customDraw = gwinRadioDraw_Tab; wi.g.width = ScrWidth/7; wi.g.height = TAB_HEIGHT; wi.g.y = 0; - wi.g.x = 0*wi.g.width; wi.text = "Buttons"; ghTabButtons = gwinRadioCreate(NULL, &wi, GROUP_TABS); - wi.g.x = 1*wi.g.width; wi.text = "Sliders"; ghTabSliders = gwinRadioCreate(NULL, &wi, GROUP_TABS); - wi.g.x = 2*wi.g.width; wi.text = "Checkbox"; ghTabCheckboxes = gwinRadioCreate(NULL, &wi, GROUP_TABS); - wi.g.x = 3*wi.g.width; wi.text = "Radios"; ghTabRadios = gwinRadioCreate(NULL, &wi, GROUP_TABS); - wi.g.x = 4*wi.g.width; wi.text = "Lists"; ghTabLists = gwinRadioCreate(NULL, &wi, GROUP_TABS); - wi.g.x = 5*wi.g.width; wi.text = "Labels"; ghTabLabels = gwinRadioCreate(NULL, &wi, GROUP_TABS); - wi.g.x = 6*wi.g.width; wi.text = "Images"; ghTabImages = gwinRadioCreate(NULL, &wi, GROUP_TABS); + wi.g.x = 0*wi.g.width; wi.text = "Buttons"; ghTabButtons = gwinRadioCreate(0, &wi, GROUP_TABS); + wi.g.x = 1*wi.g.width; wi.text = "Sliders"; ghTabSliders = gwinRadioCreate(0, &wi, GROUP_TABS); + wi.g.x = 2*wi.g.width; wi.text = "Checkbox"; ghTabCheckboxes = gwinRadioCreate(0, &wi, GROUP_TABS); + wi.g.x = 3*wi.g.width; wi.text = "Radios"; ghTabRadios = gwinRadioCreate(0, &wi, GROUP_TABS); + wi.g.x = 4*wi.g.width; wi.text = "Lists"; ghTabLists = gwinRadioCreate(0, &wi, GROUP_TABS); + wi.g.x = 5*wi.g.width; wi.text = "Labels"; ghTabLabels = gwinRadioCreate(0, &wi, GROUP_TABS); + wi.g.x = 6*wi.g.width; wi.text = "Images"; ghTabImages = gwinRadioCreate(0, &wi, GROUP_TABS); // Buttons wi.g.show = FALSE; wi.customDraw = 0; wi.g.width = BUTTON_WIDTH; wi.g.height = BUTTON_HEIGHT; wi.g.y = TAB_HEIGHT+5; - wi.g.x = 0+0*(BUTTON_WIDTH+1); wi.text = "B1"; ghButton1 = gwinButtonCreate(NULL, &wi); - wi.g.x = 0+1*(BUTTON_WIDTH+1); wi.text = "B2"; ghButton2 = gwinButtonCreate(NULL, &wi); - wi.g.x = 0+2*(BUTTON_WIDTH+1); wi.text = "B3"; ghButton3 = gwinButtonCreate(NULL, &wi); - wi.g.x = 0+3*(BUTTON_WIDTH+1); wi.text = "B4"; ghButton4 = gwinButtonCreate(NULL, &wi); + wi.g.x = 0+0*(BUTTON_WIDTH+1); wi.text = "B1"; ghButton1 = gwinButtonCreate(0, &wi); + wi.g.x = 0+1*(BUTTON_WIDTH+1); wi.text = "B2"; ghButton2 = gwinButtonCreate(0, &wi); + wi.g.x = 0+2*(BUTTON_WIDTH+1); wi.text = "B3"; ghButton3 = gwinButtonCreate(0, &wi); + wi.g.x = 0+3*(BUTTON_WIDTH+1); wi.text = "B4"; ghButton4 = gwinButtonCreate(0, &wi); // Horizontal Sliders wi.g.width = ScrWidth/2-2; wi.g.height = SLIDER_WIDTH; wi.g.x = ScrWidth/2+1; - wi.g.y = ScrHeight/2-2*(SLIDER_WIDTH+1); wi.text = "S1"; ghSlider1 = gwinSliderCreate(NULL, &wi); - wi.g.y = ScrHeight/2-1*(SLIDER_WIDTH+1); wi.text = "S2"; ghSlider2 = gwinSliderCreate(NULL, &wi); + wi.g.y = ScrHeight/2-2*(SLIDER_WIDTH+1); wi.text = "S1"; ghSlider1 = gwinSliderCreate(0, &wi); + wi.g.y = ScrHeight/2-1*(SLIDER_WIDTH+1); wi.text = "S2"; ghSlider2 = gwinSliderCreate(0, &wi); // Vertical Sliders wi.g.width = SLIDER_WIDTH; wi.g.height = ScrHeight/2-2; wi.g.y = ScrHeight/2+1; - wi.g.x = 0+0*(SLIDER_WIDTH+1); wi.text = "S3"; ghSlider3 = gwinSliderCreate(NULL, &wi); - wi.g.x = 0+1*(SLIDER_WIDTH+1); wi.text = "S4"; ghSlider4 = gwinSliderCreate(NULL, &wi); + wi.g.x = 0+0*(SLIDER_WIDTH+1); wi.text = "S3"; ghSlider3 = gwinSliderCreate(0, &wi); + wi.g.x = 0+1*(SLIDER_WIDTH+1); wi.text = "S4"; ghSlider4 = gwinSliderCreate(0, &wi); // Checkboxes - for the 2nd checkbox we apply special drawing before making it visible wi.g.width = CHECKBOX_WIDTH; wi.g.height = CHECKBOX_HEIGHT; wi.g.x = 0; - wi.g.y = TAB_HEIGHT+5+0*(CHECKBOX_HEIGHT+1); wi.text = "C1"; ghCheckbox1 = gwinCheckboxCreate(NULL, &wi); + wi.g.y = TAB_HEIGHT+5+0*(CHECKBOX_HEIGHT+1); wi.text = "C1"; ghCheckbox1 = gwinCheckboxCreate(0, &wi); wi.customDraw = gwinCheckboxDraw_CheckOnRight; - wi.g.y = TAB_HEIGHT+5+1*(CHECKBOX_HEIGHT+1); wi.text = "C2"; ghCheckbox2 = gwinCheckboxCreate(NULL, &wi); + wi.g.y = TAB_HEIGHT+5+1*(CHECKBOX_HEIGHT+1); wi.text = "C2"; ghCheckbox2 = gwinCheckboxCreate(0, &wi); wi.customDraw = 0; wi.g.width = DISABLEALL_WIDTH; - wi.g.y = TAB_HEIGHT+5+2*(CHECKBOX_HEIGHT+1); wi.text = "Disable All"; ghCheckDisableAll = gwinCheckboxCreate(NULL, &wi); + wi.g.y = TAB_HEIGHT+5+2*(CHECKBOX_HEIGHT+1); wi.text = "Disable All"; ghCheckDisableAll = gwinCheckboxCreate(0, &wi); // Labels wi.g.width = 0; wi.g.height = LABEL_HEIGHT; // dynamic width, fixed height - wi.g.y = TAB_HEIGHT+5+2*(CHECKBOX_HEIGHT+1); wi.text = "Label"; ghLabel1 = gwinLabelCreate(NULL, &wi); + wi.g.y = TAB_HEIGHT+5+2*(CHECKBOX_HEIGHT+1); wi.text = "Label"; ghLabel1 = gwinLabelCreate(0, &wi); // Radio Buttons wi.g.width = RADIO_WIDTH; wi.g.height = RADIO_HEIGHT; wi.g.y = TAB_HEIGHT+5; - wi.g.x = 0*wi.g.width; wi.text = "Yes"; ghRadio1 = gwinRadioCreate(NULL, &wi, GROUP_YESNO); - wi.g.x = 1*wi.g.width; wi.text = "No"; ghRadio2 = gwinRadioCreate(NULL, &wi, GROUP_YESNO); + wi.g.x = 0*wi.g.width; wi.text = "Yes"; ghRadio1 = gwinRadioCreate(0, &wi, GROUP_YESNO); + wi.g.x = 1*wi.g.width; wi.text = "No"; ghRadio2 = gwinRadioCreate(0, &wi, GROUP_YESNO); wi.g.width = COLOR_WIDTH; wi.g.y += RADIO_HEIGHT+5; - wi.g.x = 0*wi.g.width; wi.text = "Black"; ghRadioBlack = gwinRadioCreate(NULL, &wi, GROUP_COLORS); - wi.g.x = 1*wi.g.width; wi.text = "White"; ghRadioWhite = gwinRadioCreate(NULL, &wi, GROUP_COLORS); - wi.g.x = 2*wi.g.width; wi.text = "Yellow"; ghRadioYellow = gwinRadioCreate(NULL, &wi, GROUP_COLORS); + wi.g.x = 0*wi.g.width; wi.text = "Black"; ghRadioBlack = gwinRadioCreate(0, &wi, GROUP_COLORS); + wi.g.x = 1*wi.g.width; wi.text = "White"; ghRadioWhite = gwinRadioCreate(0, &wi, GROUP_COLORS); + wi.g.x = 2*wi.g.width; wi.text = "Yellow"; ghRadioYellow = gwinRadioCreate(0, &wi, GROUP_COLORS); gwinRadioPress(ghRadioWhite); // Lists wi.g.show = FALSE; wi.customDraw = 0; wi.g.width = LIST_WIDTH; wi.g.height = LIST_HEIGHT; wi.g.y = TAB_HEIGHT+5; - wi.g.x = 0+0*(LIST_WIDTH+1); wi.text = "L1"; ghList1 = gwinListCreate(NULL, &wi, FALSE); + wi.g.x = 0+0*(LIST_WIDTH+1); wi.text = "L1"; ghList1 = gwinListCreate(0, &wi, FALSE); gwinListAddItem(ghList1, "Item 0", FALSE); gwinListAddItem(ghList1, "Item 1", FALSE); gwinListAddItem(ghList1, "Item 2", FALSE); gwinListAddItem(ghList1, "Item 3", FALSE); gwinListAddItem(ghList1, "Item 4", FALSE); gwinListAddItem(ghList1, "Item 5", FALSE); @@ -173,7 +173,7 @@ static void createWidgets(void) { gwinListAddItem(ghList1, "Item 8", FALSE); gwinListAddItem(ghList1, "Item 9", FALSE); gwinListAddItem(ghList1, "Item 10", FALSE); gwinListAddItem(ghList1, "Item 11", FALSE); gwinListAddItem(ghList1, "Item 12", FALSE); gwinListAddItem(ghList1, "Item 13", FALSE); - wi.g.x = 0+1*(LIST_WIDTH+1); wi.text = "L2"; ghList2 = gwinListCreate(NULL, &wi, TRUE); + wi.g.x = 0+1*(LIST_WIDTH+1); wi.text = "L2"; ghList2 = gwinListCreate(0, &wi, TRUE); gwinListAddItem(ghList2, "Item 0", FALSE); gwinListAddItem(ghList2, "Item 1", FALSE); gwinListAddItem(ghList2, "Item 2", FALSE); gwinListAddItem(ghList2, "Item 3", FALSE); gwinListAddItem(ghList2, "Item 4", FALSE); gwinListAddItem(ghList2, "Item 5", FALSE); @@ -181,7 +181,7 @@ static void createWidgets(void) { gwinListAddItem(ghList2, "Item 8", FALSE); gwinListAddItem(ghList2, "Item 9", FALSE); gwinListAddItem(ghList2, "Item 10", FALSE); gwinListAddItem(ghList2, "Item 11", FALSE); gwinListAddItem(ghList2, "Item 12", FALSE); gwinListAddItem(ghList2, "Item 13", FALSE); - wi.g.x = 0+2*(LIST_WIDTH+1); wi.text = "L3"; ghList3 = gwinListCreate(NULL, &wi, TRUE); + wi.g.x = 0+2*(LIST_WIDTH+1); wi.text = "L3"; ghList3 = gwinListCreate(0, &wi, TRUE); gwinListAddItem(ghList3, "Item 0", FALSE); gwinListAddItem(ghList3, "Item 1", FALSE); gwinListAddItem(ghList3, "Item 2", FALSE); gwinListAddItem(ghList3, "Item 3", FALSE); gdispImageSetMemoryReader(&imgYesNo, image_yesno); @@ -191,14 +191,14 @@ static void createWidgets(void) { // Image wi.g.x = ScrWidth-210; wi.g.y = TAB_HEIGHT + 10; wi.g.width = 200; wi.g.height = 200; - ghImage1 = gwinImageCreate(NULL, &wi.g); + ghImage1 = gwinImageCreate(0, &wi.g); gwinImageOpenMemory(ghImage1, image_chibios); gwinImageCache(ghImage1); // Console - we apply some special colors before making it visible wi.g.width = ScrWidth/2-1; wi.g.height = ScrHeight/2-1; wi.g.x = ScrWidth/2+1; wi.g.y = ScrHeight/2+1; - ghConsole = gwinConsoleCreate(NULL, &wi.g); + ghConsole = gwinConsoleCreate(0, &wi.g); gwinSetColor(ghConsole, Yellow); gwinSetBgColor(ghConsole, Black); } diff --git a/drivers/gadc/AT91SAM7/gadc_lld.c b/drivers/gadc/AT91SAM7/gadc_lld.c index 10e8a28b..78a60109 100644 --- a/drivers/gadc/AT91SAM7/gadc_lld.c +++ b/drivers/gadc/AT91SAM7/gadc_lld.c @@ -31,7 +31,7 @@ static ADCConversionGroup acg = { }; void gadc_lld_init(void) { - adcStart(&ADCD1, NULL); + adcStart(&ADCD1, 0); } size_t gadc_lld_samples_per_conversion(uint32_t physdev) { diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index c9beb821..ad455120 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -160,7 +160,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { XInitThreads(); #endif - dis = XOpenDisplay(NULL); + dis = XOpenDisplay(0); scr = DefaultScreen(dis); cxt = XUniqueContext(); XSetIOErrorHandler(FatalXIOError); diff --git a/include/gos/chibios.h b/include/gos/chibios.h index 5cc92010..6373aa43 100644 --- a/include/gos/chibios.h +++ b/include/gos/chibios.h @@ -65,7 +65,7 @@ extern "C" { #define gfxHalt(msg) { chDbgPanic(msg); chSysHalt(); } #define gfxExit() chSysHalt() -#define gfxAlloc(sz) chHeapAlloc(NULL, sz) +#define gfxAlloc(sz) chHeapAlloc(0, sz) #define gfxFree(ptr) chHeapFree(ptr) #define gfxYield() chThdYield() #define gfxSystemTicks() chTimeNow() diff --git a/include/gos/win32.h b/include/gos/win32.h index de29ea3b..2840ffcf 100644 --- a/include/gos/win32.h +++ b/include/gos/win32.h @@ -68,14 +68,14 @@ typedef HANDLE gfxThreadHandle; #define gfxYield() Sleep(0) #define gfxSystemTicks() GetTickCount() #define gfxMillisecondsToTicks(ms) (ms) -#define gfxMutexInit(pmutex) *(pmutex) = CreateMutex(NULL, FALSE, NULL) +#define gfxMutexInit(pmutex) *(pmutex) = CreateMutex(0, FALSE, 0) #define gfxMutexDestory(pmutex) CloseHandle(*(pmutex)) #define gfxMutexEnter(pmutex) WaitForSingleObject(*(pmutex), INFINITE) #define gfxMutexExit(pmutex) ReleaseMutex(*(pmutex)) -#define gfxSemInit(psem, val, limit) *(psem) = CreateSemaphore(NULL, val, limit, NULL) +#define gfxSemInit(psem, val, limit) *(psem) = CreateSemaphore(0, val, limit, 0) #define gfxSemDestory(psem) CloseHandle(*(psem)) -#define gfxSemSignal(psem) ReleaseSemaphore(*(psem), 1, NULL) -#define gfxSemSignalI(psem) ReleaseSemaphore(*(psem), 1, NULL) +#define gfxSemSignal(psem) ReleaseSemaphore(*(psem), 1, 0) +#define gfxSemSignalI(psem) ReleaseSemaphore(*(psem), 1, 0) #define gfxSemCounterI(psem) gfxSemCounter(psem) #define gfxThreadMe() GetCurrentThread() #define gfxThreadClose(thread) CloseHandle(thread) diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c index ffd934c1..e297ef7e 100644 --- a/src/gadc/gadc.c +++ b/src/gadc/gadc.c @@ -344,7 +344,7 @@ void gadcHighSpeedInit(uint32_t physdev, uint32_t frequency, adcsample_t *buffer #if GFX_USE_GEVENT GSourceHandle gadcHighSpeedGetSource(void) { if (!gtimerIsActive(&HighSpeedGTimer)) - gtimerStart(&HighSpeedGTimer, HighSpeedGTimerCallback, NULL, TRUE, TIME_INFINITE); + gtimerStart(&HighSpeedGTimer, HighSpeedGTimerCallback, 0, TRUE, TIME_INFINITE); hs.flags |= GADC_FLG_GTIMER; return (GSourceHandle)&HighSpeedGTimer; } @@ -393,7 +393,7 @@ void gadcLowSpeedGet(uint32_t physdev, adcsample_t *buffer) { gfxSemInit(&mysem, 1, 1); gfxMutexEnter(&gadcmutex); if (!gtimerIsActive(&LowSpeedGTimer)) - gtimerStart(&LowSpeedGTimer, LowSpeedGTimerCallback, NULL, TRUE, TIME_INFINITE); + gtimerStart(&LowSpeedGTimer, LowSpeedGTimerCallback, 0, TRUE, TIME_INFINITE); gfxMutexExit(&gadcmutex); while(1) { @@ -430,7 +430,7 @@ bool_t gadcLowSpeedStart(uint32_t physdev, adcsample_t *buffer, GADCCallbackFunc /* Start the Low Speed Timer */ gfxMutexEnter(&gadcmutex); if (!gtimerIsActive(&LowSpeedGTimer)) - gtimerStart(&LowSpeedGTimer, LowSpeedGTimerCallback, NULL, TRUE, TIME_INFINITE); + gtimerStart(&LowSpeedGTimer, LowSpeedGTimerCallback, 0, TRUE, TIME_INFINITE); /* Find a slot */ for(p = ls; p < &ls[GADC_MAX_LOWSPEED_DEVICES]; p++) { diff --git a/src/gaudin/gaudin.c b/src/gaudin/gaudin.c index cddab32f..a6e173ce 100644 --- a/src/gaudin/gaudin.c +++ b/src/gaudin/gaudin.c @@ -119,7 +119,7 @@ bool_t gaudinInit(uint16_t channel, uint32_t frequency, audin_sample_t *buffer, #if GFX_USE_GEVENT GSourceHandle gaudinGetSource(void) { if (!gtimerIsActive(&AudGTimer)) - gtimerStart(&AudGTimer, AudGTimerCallback, NULL, TRUE, TIME_INFINITE); + gtimerStart(&AudGTimer, AudGTimerCallback, 0, TRUE, TIME_INFINITE); audFlags |= AUDFLG_USE_EVENTS; return (GSourceHandle)&aud; } diff --git a/src/gdisp/fonts.c b/src/gdisp/fonts.c index 937102ee..ea8d1615 100644 --- a/src/gdisp/fonts.c +++ b/src/gdisp/fonts.c @@ -74,7 +74,7 @@ void gdispCloseFont(font_t font) { struct mf_font_s *dfont = (struct mf_font_s *)font; /* Make sure that no-one can successfully use font after closing */ - dfont->render_character = NULL; + dfont->render_character = 0; /* Release the allocated memory */ gfxFree(dfont); diff --git a/src/gos/chibios.c b/src/gos/chibios.c index 3af0047b..30a2b228 100644 --- a/src/gos/chibios.c +++ b/src/gos/chibios.c @@ -106,7 +106,7 @@ gfxThreadHandle gfxThreadCreate(void *stackarea, size_t stacksz, threadpriority_ } if (!stacksz) - return NULL; + return 0; return chThdCreateStatic(stackarea, stacksz, prio, fn, param); } diff --git a/src/gos/osx.c b/src/gos/osx.c index 3692fe5e..a5560b4e 100644 --- a/src/gos/osx.c +++ b/src/gos/osx.c @@ -149,7 +149,7 @@ bool_t gfxSemWait(gfxSem *pSem, delaytime_t ms) { struct timeval now; struct timespec tm; - gettimeofday(&now, NULL); + gettimeofday(&now, 0); tm.tv_sec = now.tv_sec + ms / 1000; tm.tv_nsec = (now.tv_usec + ms % 1000) * 1000; while (!pSem->cnt) { diff --git a/src/gos/win32.c b/src/gos/win32.c index 77b35dc3..a05e5c30 100644 --- a/src/gos/win32.c +++ b/src/gos/win32.c @@ -57,7 +57,7 @@ void gfxSleepMicroseconds(delaytime_t ms) { void gfxSystemLock(void) { if (!SystemMutex) - SystemMutex = CreateMutex(NULL, FALSE, NULL); + SystemMutex = CreateMutex(0, FALSE, 0); WaitForSingleObject(SystemMutex, INFINITE); } @@ -87,7 +87,7 @@ semcount_t gfxSemCounter(gfxSem *pSem) { if (!NtQuerySemaphore) NtQuerySemaphore = (_NtQuerySemaphore)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQuerySemaphore"); - NtQuerySemaphore(*pSem, 0, &BasicInfo, sizeof(BasicInfo), NULL); + NtQuerySemaphore(*pSem, 0, &BasicInfo, sizeof(BasicInfo), 0); return BasicInfo.CurrentCount; } @@ -96,7 +96,7 @@ gfxThreadHandle gfxThreadCreate(void *stackarea, size_t stacksz, threadpriority_ (void) stackarea; HANDLE thd; - if (!(thd = CreateThread(NULL, stacksz, fn, param, CREATE_SUSPENDED, NULL))) + if (!(thd = CreateThread(0, stacksz, fn, param, CREATE_SUSPENDED, 0))) return FALSE; SetThreadPriority(thd, prio); diff --git a/src/gqueue/gqueue.c b/src/gqueue/gqueue.c index 00bdede6..2adfd9ff 100644 --- a/src/gqueue/gqueue.c +++ b/src/gqueue/gqueue.c @@ -83,7 +83,7 @@ } bool_t gfxQueueASyncIsEmpty(gfxQueueASync *pqueue) { - return pqueue->head == NULL; + return pqueue->head == 0; } bool_t gfxQueueASyncIsIn(gfxQueueASync *pqueue, const gfxQueueASyncItem *pitem) { @@ -176,7 +176,7 @@ } bool_t gfxQueueGSyncIsEmpty(gfxQueueGSync *pqueue) { - return pqueue->head == NULL; + return pqueue->head == 0; } bool_t gfxQueueGSyncIsIn(gfxQueueGSync *pqueue, const gfxQueueGSyncItem *pitem) { @@ -282,7 +282,7 @@ } bool_t gfxQueueFSyncIsEmpty(gfxQueueFSync *pqueue) { - return pqueue->head == NULL; + return pqueue->head == 0; } bool_t gfxQueueFSyncIsIn(gfxQueueFSync *pqueue, const gfxQueueFSyncItem *pitem) { diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c index 7425f65d..de40e16c 100644 --- a/src/gtimer/gtimer.c +++ b/src/gtimer/gtimer.c @@ -132,8 +132,8 @@ void gtimerStart(GTimer *pt, GTimerFunction fn, void *param, bool_t periodic, de // Start our thread if not already going if (!hThread) { - hThread = gfxThreadCreate(waTimerThread, sizeof(waTimerThread), GTIMER_THREAD_PRIORITY, GTimerThreadHandler, NULL); - if (hThread) gfxThreadClose(hThread); // We never really need the handle again + hThread = gfxThreadCreate(waTimerThread, sizeof(waTimerThread), GTIMER_THREAD_PRIORITY, GTimerThreadHandler, 0); + if (hThread) {gfxThreadClose(hThread);} // We never really need the handle again } // Is this already scheduled?