Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 21:07:40 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

STM32 arch i2c wrap generic functions at top of file in ifdef USE_I2C2 to prevent

Browse Source 
warnings when only using I2C1
This commit is contained in:
Allen
2011-03-03 14:49:24 -08:00
parent 9701c314c9
commit f26337351f
1 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
+2 -28
View File
@@ -75,19 +75,16 @@ static inline void abort_and_reset(struct i2c_periph *p) {
end_of_transaction(p); end_of_transaction(p);
} }
#ifdef USE_I2C2
static inline void on_status_start_requested(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_start_requested(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
static inline void on_status_addr_wr_sent(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_addr_wr_sent(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
static inline void on_status_sending_byte(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_sending_byte(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
//static inline void on_status_sending_last_byte(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
static inline void on_status_stop_requested(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_stop_requested(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
static inline void on_status_addr_rd_sent(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_addr_rd_sent(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
static inline void on_status_reading_byte(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_reading_byte(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
static inline void on_status_reading_last_byte(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_reading_last_byte(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
static inline void on_status_restart_requested(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event); static inline void on_status_restart_requested(struct i2c_periph *periph, struct i2c_transaction* trans, uint32_t event);
/* /*
* Start Requested * Start Requested
* *
@@ -169,30 +166,6 @@ static inline void on_status_sending_byte(struct i2c_periph *periph, struct i2c_
SPURIOUS_INTERRUPT(I2CSendingByte, event); SPURIOUS_INTERRUPT(I2CSendingByte, event);
} }
#if 0
/*
* Sending last byte
*
*/
static inline void on_status_sending_last_byte(struct i2c_transaction* trans, uint32_t event) {
if (event & I2C_FLAG_TXE) { // should really be BTF as we're supposed to have disabled buf it already
struct i2c_transaction* trans = i2c2.trans[i2c2.trans_extract_idx];
if (trans->type == I2CTransTx) {
I2C_GenerateSTOP(I2C2, ENABLE);
i2c2.status = I2CStopRequested;
}
else {
I2C_GenerateSTART(I2C2, ENABLE);
i2c2.status = I2CRestartRequested;
}
// I2C_ITConfig(I2C2, I2C_IT_BUF, DISABLE);
}
else
SPURIOUS_INTERRUPT(I2CSendingLastByte, event);
}
#endif
/* /*
* Stop Requested * Stop Requested
* *
@@ -445,6 +418,7 @@ static inline void i2c_reset_init(struct i2c_periph *p)
// enable error interrupts // enable error interrupts
I2C_ITConfig(p->reg_addr, I2C_IT_ERR, ENABLE); I2C_ITConfig(p->reg_addr, I2C_IT_ERR, ENABLE);
} }
#endif
#ifdef USE_I2C1 #ifdef USE_I2C1