- fix F411 F334 systeminit when HSI used - portinout always read IDR regardless of port direction

Fork of mbed-src by mbed official

Committer:
Geremia
Date:
Sat Sep 27 11:16:28 2014 +0000
Revision:
332:e299ae530e63
Parent:
296:ec1b66a3d094
- fix F411 F334 systeminit when HSI used; - STMs PortInOut port.read() always read input data register (real external pin state) even if direction is output (same as other platforms)

Who changed what in which revision?

UserRevisionLine numberNew contents of line
mbed_official 133:d4dda5c437f0 1 /* mbed Microcontroller Library
mbed_official 133:d4dda5c437f0 2 *******************************************************************************
mbed_official 133:d4dda5c437f0 3 * Copyright (c) 2014, STMicroelectronics
mbed_official 133:d4dda5c437f0 4 * All rights reserved.
mbed_official 133:d4dda5c437f0 5 *
mbed_official 133:d4dda5c437f0 6 * Redistribution and use in source and binary forms, with or without
mbed_official 133:d4dda5c437f0 7 * modification, are permitted provided that the following conditions are met:
mbed_official 133:d4dda5c437f0 8 *
mbed_official 133:d4dda5c437f0 9 * 1. Redistributions of source code must retain the above copyright notice,
mbed_official 133:d4dda5c437f0 10 * this list of conditions and the following disclaimer.
mbed_official 133:d4dda5c437f0 11 * 2. Redistributions in binary form must reproduce the above copyright notice,
mbed_official 133:d4dda5c437f0 12 * this list of conditions and the following disclaimer in the documentation
mbed_official 133:d4dda5c437f0 13 * and/or other materials provided with the distribution.
mbed_official 133:d4dda5c437f0 14 * 3. Neither the name of STMicroelectronics nor the names of its contributors
mbed_official 133:d4dda5c437f0 15 * may be used to endorse or promote products derived from this software
mbed_official 133:d4dda5c437f0 16 * without specific prior written permission.
mbed_official 133:d4dda5c437f0 17 *
mbed_official 133:d4dda5c437f0 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
mbed_official 133:d4dda5c437f0 19 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
mbed_official 133:d4dda5c437f0 20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
mbed_official 133:d4dda5c437f0 21 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
mbed_official 133:d4dda5c437f0 22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
mbed_official 133:d4dda5c437f0 23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
mbed_official 133:d4dda5c437f0 24 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
mbed_official 133:d4dda5c437f0 25 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
mbed_official 133:d4dda5c437f0 26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
mbed_official 133:d4dda5c437f0 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
mbed_official 133:d4dda5c437f0 28 *******************************************************************************
mbed_official 133:d4dda5c437f0 29 */
mbed_official 133:d4dda5c437f0 30 #ifndef MBED_OBJECTS_H
mbed_official 133:d4dda5c437f0 31 #define MBED_OBJECTS_H
mbed_official 133:d4dda5c437f0 32
mbed_official 133:d4dda5c437f0 33 #include "cmsis.h"
mbed_official 133:d4dda5c437f0 34 #include "PortNames.h"
mbed_official 133:d4dda5c437f0 35 #include "PeripheralNames.h"
mbed_official 133:d4dda5c437f0 36 #include "PinNames.h"
mbed_official 133:d4dda5c437f0 37
mbed_official 133:d4dda5c437f0 38 #ifdef __cplusplus
mbed_official 133:d4dda5c437f0 39 extern "C" {
mbed_official 133:d4dda5c437f0 40 #endif
mbed_official 133:d4dda5c437f0 41
mbed_official 133:d4dda5c437f0 42 struct gpio_irq_s {
mbed_official 133:d4dda5c437f0 43 IRQn_Type irq_n;
mbed_official 133:d4dda5c437f0 44 uint32_t irq_index;
mbed_official 133:d4dda5c437f0 45 uint32_t event;
mbed_official 133:d4dda5c437f0 46 PinName pin;
mbed_official 133:d4dda5c437f0 47 };
mbed_official 133:d4dda5c437f0 48
mbed_official 133:d4dda5c437f0 49 struct port_s {
mbed_official 133:d4dda5c437f0 50 PortName port;
mbed_official 133:d4dda5c437f0 51 uint32_t mask;
mbed_official 133:d4dda5c437f0 52 PinDirection direction;
mbed_official 133:d4dda5c437f0 53 __IO uint32_t *reg_in;
mbed_official 133:d4dda5c437f0 54 __IO uint32_t *reg_out;
mbed_official 133:d4dda5c437f0 55 };
mbed_official 133:d4dda5c437f0 56
mbed_official 133:d4dda5c437f0 57 struct analogin_s {
mbed_official 133:d4dda5c437f0 58 ADCName adc;
mbed_official 133:d4dda5c437f0 59 PinName pin;
mbed_official 133:d4dda5c437f0 60 };
mbed_official 133:d4dda5c437f0 61
mbed_official 141:706f8dea204a 62 struct dac_s {
mbed_official 141:706f8dea204a 63 DACName dac;
mbed_official 141:706f8dea204a 64 PinName channel;
mbed_official 141:706f8dea204a 65 };
mbed_official 141:706f8dea204a 66
mbed_official 133:d4dda5c437f0 67 struct serial_s {
mbed_official 133:d4dda5c437f0 68 UARTName uart;
mbed_official 133:d4dda5c437f0 69 int index; // Used by irq
mbed_official 133:d4dda5c437f0 70 uint32_t baudrate;
mbed_official 133:d4dda5c437f0 71 uint32_t databits;
mbed_official 133:d4dda5c437f0 72 uint32_t stopbits;
mbed_official 133:d4dda5c437f0 73 uint32_t parity;
mbed_official 242:7074e42da0b2 74 PinName pin_tx;
mbed_official 242:7074e42da0b2 75 PinName pin_rx;
mbed_official 133:d4dda5c437f0 76 };
mbed_official 133:d4dda5c437f0 77
mbed_official 133:d4dda5c437f0 78 struct spi_s {
mbed_official 133:d4dda5c437f0 79 SPIName spi;
mbed_official 133:d4dda5c437f0 80 uint32_t bits;
mbed_official 133:d4dda5c437f0 81 uint32_t cpol;
mbed_official 133:d4dda5c437f0 82 uint32_t cpha;
mbed_official 133:d4dda5c437f0 83 uint32_t mode;
mbed_official 133:d4dda5c437f0 84 uint32_t nss;
mbed_official 133:d4dda5c437f0 85 uint32_t br_presc;
mbed_official 242:7074e42da0b2 86 PinName pin_miso;
mbed_official 242:7074e42da0b2 87 PinName pin_mosi;
mbed_official 242:7074e42da0b2 88 PinName pin_sclk;
mbed_official 242:7074e42da0b2 89 PinName pin_ssel;
mbed_official 133:d4dda5c437f0 90 };
mbed_official 133:d4dda5c437f0 91
mbed_official 133:d4dda5c437f0 92 struct i2c_s {
mbed_official 133:d4dda5c437f0 93 I2CName i2c;
mbed_official 242:7074e42da0b2 94 uint32_t slave;
mbed_official 133:d4dda5c437f0 95 };
mbed_official 133:d4dda5c437f0 96
mbed_official 133:d4dda5c437f0 97 struct pwmout_s {
mbed_official 133:d4dda5c437f0 98 PWMName pwm;
mbed_official 133:d4dda5c437f0 99 PinName pin;
mbed_official 133:d4dda5c437f0 100 uint32_t period;
mbed_official 133:d4dda5c437f0 101 uint32_t pulse;
mbed_official 133:d4dda5c437f0 102 };
mbed_official 133:d4dda5c437f0 103
mbed_official 133:d4dda5c437f0 104 #include "gpio_object.h"
mbed_official 133:d4dda5c437f0 105
mbed_official 133:d4dda5c437f0 106 #ifdef __cplusplus
mbed_official 133:d4dda5c437f0 107 }
mbed_official 133:d4dda5c437f0 108 #endif
mbed_official 133:d4dda5c437f0 109
mbed_official 133:d4dda5c437f0 110 #endif