The unified diff between revisions [b85a3bbc..] and [dcfa34d1..] is displayed below. It can also be downloaded as a raw diff.
# # old_revision [b85a3bbccc40f21e02f50101af764be93eeb9538] # new_revision [dcfa34d1bbf576aab0f0d0ed1b0c64dc6160ee5b] # # patch "Makefile" # from [479d31a1bbcf4db0ce420abbed6feb38d78d2245] # to [a138dfe535ffa07a2fe757f088e1451a3f4aff9a] # # patch "i2c.c" # from [aa38cfd51b998ec3960be6052827278b26edcc40] # to [1d978ba6c211e6b68c567fa852d9cbefe8ebad13] # # patch "i2c.h" # from [bcffa252b76002931a95d727ede2f201d1a6f614] # to [383d50d6e5547f52b22d5a878835d6c21926f031] # # patch "main.c" # from [3a525d062c198ad4a596f4bfb7360c3acbf5acfb] # to [90a64947477382812d4151d8680e54c2b4d67170] # # patch "wmp.c" # from [8d25d8c39e514fb55119ecd0aa362a137e760a46] # to [5f733d08f12cc7ab58dbe720d7ac20c713bf5687] # ============================================================ --- Makefile 479d31a1bbcf4db0ce420abbed6feb38d78d2245 +++ Makefile a138dfe535ffa07a2fe757f088e1451a3f4aff9a @@ -5,7 +5,8 @@ CSRCS=main.c i2c.c wmp.c timer.c SSRCS=crt0.s CSRCS=main.c i2c.c wmp.c timer.c -CFLAGS=-march=armv4t -msoft-float -O1 +COPTIM?=-O1 +CFLAGS=-march=armv4t -msoft-float $(COPTIM) -Wall -Werror LDSCRIPT=lpc2103_flash.ld CC=arm-elf-gcc ============================================================ --- i2c.c aa38cfd51b998ec3960be6052827278b26edcc40 +++ i2c.c 1d978ba6c211e6b68c567fa852d9cbefe8ebad13 @@ -79,7 +79,7 @@ bool i2c_send_address(int addr, bool wri return i2c_send_data((addr<<1) + (write?0:1)); } -bool i2c_send_data(int data) +bool i2c_send_data(unsigned int data) { IREG(I2DAT) = data; IREG(I2CONCLR) = STAFLAG | STOFLAG | SIFLAG; @@ -94,7 +94,7 @@ bool i2c_send_data(int data) } } -bool i2c_receive_data(int *data, bool last) +bool i2c_receive_data(unsigned int *data, bool last) { if (!last) IREG(I2CONSET) = AAFLAG; ============================================================ --- i2c.h bcffa252b76002931a95d727ede2f201d1a6f614 +++ i2c.h 383d50d6e5547f52b22d5a878835d6c21926f031 @@ -10,8 +10,8 @@ bool i2c_send_address(int addr, bool wri int i2c_statreg(void); bool i2c_send_start(void); bool i2c_send_address(int addr, bool write); -bool i2c_send_data(int data); -bool i2c_receive_data(int *data, bool last); +bool i2c_send_data(unsigned int data); +bool i2c_receive_data(unsigned int *data, bool last); void i2c_send_stop(void); #endif /* __I2C_H */ ============================================================ --- main.c 3a525d062c198ad4a596f4bfb7360c3acbf5acfb +++ main.c 90a64947477382812d4151d8680e54c2b4d67170 @@ -228,7 +228,6 @@ int main(void) { int main(void) { int i; - int data; init_uart(); init_i2c(); init_pins(); ============================================================ --- wmp.c 8d25d8c39e514fb55119ecd0aa362a137e760a46 +++ wmp.c 5f733d08f12cc7ab58dbe720d7ac20c713bf5687 @@ -13,6 +13,7 @@ bool wmp_init(void) if (!i2c_send_data(0x04)) return FALSE; i2c_send_stop(); + return TRUE; } unsigned char wmp_calibration_data[0x20];