From 015b046c1ef74739649f4df0ecc98f3795a9416a Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 18 Jul 2009 01:39:30 +0200 Subject: Merge stdint.h contents into common.h so we don't conflict with libc. --- include/libopenstm32/common.h | 8 ++++++++ include/libopenstm32/stdint.h | 32 -------------------------------- 2 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 include/libopenstm32/stdint.h (limited to 'include/libopenstm32') diff --git a/include/libopenstm32/common.h b/include/libopenstm32/common.h index d322374..bc00065 100644 --- a/include/libopenstm32/common.h +++ b/include/libopenstm32/common.h @@ -23,6 +23,14 @@ #include "libopenstm32.h" +/* Type definitions */ +typedef signed char s8; +typedef signed short s16; +typedef signed long s32; +typedef unsigned char u8; +typedef unsigned short u16; +typedef unsigned long u32; + /* Generic memory-mapped I/O accessor functions */ #define MMIO8(addr) (*(volatile u8 *)(addr)) #define MMIO16(addr) (*(volatile u16 *)(addr)) diff --git a/include/libopenstm32/stdint.h b/include/libopenstm32/stdint.h deleted file mode 100644 index 8b73566..0000000 --- a/include/libopenstm32/stdint.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the libopenstm32 project. - * - * Copyright (C) 2009 Uwe Hermann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef LIBOPENSTM32_STDINT_H -#define LIBOPENSTM32_STDINT_H - -typedef signed char s8; -typedef signed short s16; -typedef signed long s32; - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned long u32; - -#endif -- cgit v1.2.3