aboutsummaryrefslogtreecommitdiffstats
path: root/boards/base/Marlin
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-12-21 13:21:59 +1000
committerinmarket <andrewh@inmarket.com.au>2013-12-21 13:21:59 +1000
commitd9f02858fdc04c4404834a033850f758e4c8ee7e (patch)
tree2d7b4759cabf76eba5b7ef2147e58d3c9d7f885b /boards/base/Marlin
parent018a930d5525ffefc30fb2514752918455853685 (diff)
downloaduGFX-d9f02858fdc04c4404834a033850f758e4c8ee7e.tar.gz
uGFX-d9f02858fdc04c4404834a033850f758e4c8ee7e.tar.bz2
uGFX-d9f02858fdc04c4404834a033850f758e4c8ee7e.zip
Replace NULL's with 0 as NULL is not defined by the Raw32 GOS.
Diffstat (limited to 'boards/base/Marlin')
-rw-r--r--boards/base/Marlin/ginput_lld_mouse_board.h4
1 files changed, 2 insertions, 2 deletions
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);