aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann2009-07-18 01:39:30 +0200
committerUwe Hermann2009-07-18 01:39:30 +0200
commit015b046c1ef74739649f4df0ecc98f3795a9416a (patch)
treeaa388fdcae358976e8ee44d6476db7d3c300e4a5
parentcf7d4df189344f7e0721e64db5ae3031e891dbfb (diff)
Merge stdint.h contents into common.h so we don't conflict with libc.
-rw-r--r--include/libopenstm32.h1
-rw-r--r--include/libopenstm32/common.h8
-rw-r--r--include/libopenstm32/stdint.h32
3 files changed, 8 insertions, 33 deletions
diff --git a/include/libopenstm32.h b/include/libopenstm32.h
index 89f0ebe..3196ca8 100644
--- a/include/libopenstm32.h
+++ b/include/libopenstm32.h
@@ -21,7 +21,6 @@
#ifndef LIBOPENSTM32_LIBOPENSTM32_H
#define LIBOPENSTM32_LIBOPENSTM32_H
-#include "libopenstm32/stdint.h"
#include "libopenstm32/common.h"
#include "libopenstm32/memorymap.h"
#include "libopenstm32/gpio.h"
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 <uwe@hermann-uwe.de>
- *
- * 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