Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
I2C: Restore on F1, refactoring prep for F2.
Bring back <libmaple/i2c.h> support on STM32F1 with a view towards how it'll be implemented on STM32F2. There are still many F1-isms in libmaple/i2c.c and <libmaple/i2c.h>, to be dealt with subsequently. Move device declarations and base pointer definitions to a new F1 <series/i2c.h>. The register maps and bit definitions themselves are identical on both series, so leave them in the libmaple header. Add i2c_private.h, which contains: - I2C_DEV(), a convenience macro for defining an i2c_dev, and - declarations for the event and error IRQ handlers. The IRQ handlers are large, and I2C is slow anyway, so I see no reason to make them inline in the private header (as we do for some other peripherals). We just expose the existing ones that were formerly static in libmaple/i2c.c, but prefix the names with underscore. Move the device declarations and IRQ handlers into new stm32f1/i2c.c. These use the i2c_private.h API. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
- Loading branch information
Marti Bolivar
committed
Jun 22, 2012
1 parent
413853a
commit 7c81947
Showing
7 changed files
with
171 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/****************************************************************************** | ||
* The MIT License | ||
* | ||
* Copyright (c) 2012 LeafLabs, LLC. | ||
* | ||
* Permission is hereby granted, free of charge, to any person | ||
* obtaining a copy of this software and associated documentation | ||
* files (the "Software"), to deal in the Software without | ||
* restriction, including without limitation the rights to use, copy, | ||
* modify, merge, publish, distribute, sublicense, and/or sell copies | ||
* of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be | ||
* included in all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*****************************************************************************/ | ||
|
||
#ifndef _LIBMAPLE_I2C_PRIVATE_H_ | ||
#define _LIBMAPLE_I2C_PRIVATE_H_ | ||
|
||
#define I2C_DEV(num, port, sda, scl) \ | ||
{ \ | ||
.regs = I2C##num##_BASE, \ | ||
.gpio_port = port, \ | ||
.sda_pin = sda, \ | ||
.scl_pin = scl, \ | ||
.clk_id = RCC_I2C##num, \ | ||
.ev_nvic_line = NVIC_I2C##num##_EV, \ | ||
.er_nvic_line = NVIC_I2C##num##_ER, \ | ||
.state = I2C_STATE_DISABLED, \ | ||
} | ||
|
||
struct i2c_dev; | ||
void _i2c_irq_handler(struct i2c_dev *dev); | ||
void _i2c_irq_error_handler(struct i2c_dev *dev); | ||
|
||
#endif /* _LIBMAPLE_I2C_PRIVATE_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/****************************************************************************** | ||
* The MIT License | ||
* | ||
* Copyright (c) 2012 LeafLabs, LLC. | ||
* | ||
* Permission is hereby granted, free of charge, to any person | ||
* obtaining a copy of this software and associated documentation | ||
* files (the "Software"), to deal in the Software without | ||
* restriction, including without limitation the rights to use, copy, | ||
* modify, merge, publish, distribute, sublicense, and/or sell copies | ||
* of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be | ||
* included in all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*****************************************************************************/ | ||
|
||
#include "i2c_private.h" | ||
#include <libmaple/i2c.h> | ||
|
||
/* | ||
* Devices | ||
*/ | ||
|
||
static i2c_dev i2c1 = I2C_DEV(1, &gpiob, 7, 6); | ||
static i2c_dev i2c2 = I2C_DEV(2, &gpiob, 11, 10); | ||
|
||
/** STM32F1 I2C device 1 */ | ||
i2c_dev* const I2C1 = &i2c1; | ||
/** STM32F1 I2C device 2 */ | ||
i2c_dev* const I2C2 = &i2c2; | ||
|
||
/* | ||
* IRQ handlers | ||
*/ | ||
|
||
void __irq_i2c1_ev(void) { | ||
_i2c_irq_handler(I2C1); | ||
} | ||
|
||
void __irq_i2c2_ev(void) { | ||
_i2c_irq_handler(I2C2); | ||
} | ||
|
||
void __irq_i2c1_er(void) { | ||
_i2c_irq_error_handler(I2C1); | ||
} | ||
|
||
void __irq_i2c2_er(void) { | ||
_i2c_irq_error_handler(I2C2); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/****************************************************************************** | ||
* The MIT License | ||
* | ||
* Copyright (c) 2010 Perry Hung (from <libmaple/i2c.h>). | ||
* Copyright (c) 2012 LeafLabs, LLC. | ||
* | ||
* Permission is hereby granted, free of charge, to any person | ||
* obtaining a copy of this software and associated documentation | ||
* files (the "Software"), to deal in the Software without | ||
* restriction, including without limitation the rights to use, copy, | ||
* modify, merge, publish, distribute, sublicense, and/or sell copies | ||
* of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be | ||
* included in all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*****************************************************************************/ | ||
|
||
/** | ||
* @file libmaple/include/stm32f1/include/series/i2c.h | ||
* @brief STM32F1 I2C | ||
*/ | ||
|
||
#ifndef _LIBMAPLE_STM32F1_I2C_H_ | ||
#define _LIBMAPLE_STM32F1_I2C_H_ | ||
|
||
/* | ||
* Register maps | ||
*/ | ||
|
||
struct i2c_reg_map; | ||
|
||
/** STM32F1 I2C1 register map base pointer */ | ||
#define I2C1_BASE ((struct i2c_reg_map*)0x40005400) | ||
/** STM32F1 I2C2 register map base pointer */ | ||
#define I2C2_BASE ((struct i2c_reg_map*)0x40005800) | ||
|
||
/* | ||
* Devices | ||
*/ | ||
|
||
struct i2c_dev; | ||
|
||
extern struct i2c_dev* const I2C1; | ||
extern struct i2c_dev* const I2C2; | ||
|
||
#endif /* _LIBMAPLE_STM32F1_I2C_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters