andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2516 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2010-12-21 18:25:56 +00:00
parent f2386f6a22
commit 0f395838d3
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os/hal/include/mmc_spi.h
View File

@ -120,9 +120,10 @@ typedef bool_t (*mmcquery_t)(void);
/** /**
* @brief Driver configuration structure. * @brief Driver configuration structure.
* @note Not required in the current implementation.
*/ */
typedef struct { typedef struct {
uint8_t dummy;
} MMCConfig; } MMCConfig;
/** /**

5
os/hal/src/adc.c
View File

@ -91,13 +91,14 @@ void adcObjectInit(ADCDriver *adcp) {
* @brief Configures and activates the ADC peripheral. * @brief Configures and activates the ADC peripheral.
* *
* @param[in] adcp pointer to the @p ADCDriver object * @param[in] adcp pointer to the @p ADCDriver object
* @param[in] config pointer to the @p ADCConfig object * @param[in] config pointer to the @p ADCConfig object. Depending on
* the implementation the value can be @p NULL.
* *
* @api * @api
*/ */
void adcStart(ADCDriver *adcp, const ADCConfig *config) { void adcStart(ADCDriver *adcp, const ADCConfig *config) {
chDbgCheck((adcp != NULL) && (config != NULL), "adcStart"); chDbgCheck(adcp != NULL, "adcStart");
chSysLock(); chSysLock();
chDbgAssert((adcp->ad_state == ADC_STOP) || (adcp->ad_state == ADC_READY), chDbgAssert((adcp->ad_state == ADC_STOP) || (adcp->ad_state == ADC_READY),

5
os/hal/src/can.c
View File

@ -88,13 +88,14 @@ void canObjectInit(CANDriver *canp) {
* complete. * complete.
* *
* @param[in] canp pointer to the @p CANDriver object * @param[in] canp pointer to the @p CANDriver object
* @param[in] config pointer to the @p CANConfig object * @param[in] config pointer to the @p CANConfig object. Depending on
* the implementation the value can be @p NULL.
* *
* @api * @api
*/ */
void canStart(CANDriver *canp, const CANConfig *config) { void canStart(CANDriver *canp, const CANConfig *config) {
chDbgCheck((canp != NULL) && (config != NULL), "canStart"); chDbgCheck(canp != NULL, "canStart");
chSysLock(); chSysLock();
chDbgAssert((canp->cd_state == CAN_STOP) || chDbgAssert((canp->cd_state == CAN_STOP) ||

4
os/hal/src/mmc_spi.c
View File

@ -236,13 +236,13 @@ void mmcObjectInit(MMCDriver *mmcp, SPIDriver *spip,
* @brief Configures and activates the MMC peripheral. * @brief Configures and activates the MMC peripheral.
* *
* @param[in] mmcp pointer to the @p MMCDriver object * @param[in] mmcp pointer to the @p MMCDriver object
* @param[in] config pointer to the @p MMCConfig object * @param[in] config pointer to the @p MMCConfig object. Must be @p NULL.
* *
* @api * @api
*/ */
void mmcStart(MMCDriver *mmcp, const MMCConfig *config) { void mmcStart(MMCDriver *mmcp, const MMCConfig *config) {
chDbgCheck((mmcp != NULL) && (config != NULL), "mmcStart"); chDbgCheck((mmcp != NULL) && (config == NULL), "mmcStart");
chSysLock(); chSysLock();
chDbgAssert(mmcp->mmc_state == MMC_STOP, "mmcStart(), #1", "invalid state"); chDbgAssert(mmcp->mmc_state == MMC_STOP, "mmcStart(), #1", "invalid state");

4
readme.txt
View File

@ -67,6 +67,10 @@
*** 2.1.7 *** *** 2.1.7 ***
- NEW: New ARM Cortex-Mx port for RVCT compiler (probably will not be - NEW: New ARM Cortex-Mx port for RVCT compiler (probably will not be
included in 2.2.0, requires more testing). included in 2.2.0, requires more testing).
- CHANGE: Modified the ADC and CAN drivers to allow a NULL pointer for
the configuration structure if it is not required by the implementation.
- CHANGE: Modified the MMC_SPI driver to *require* a NULL as pointer to
the configuration.
- CHANGE: Removed enforced inlining for the chSchReadyI() function when - CHANGE: Removed enforced inlining for the chSchReadyI() function when
the CH_OPTIMIZE_SPEED is enabled. Now the matter is left to the compiler the CH_OPTIMIZE_SPEED is enabled. Now the matter is left to the compiler
specific settings. This change is meant to increase compatibility with specific settings. This change is meant to increase compatibility with