jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge stdint.h contents into common.h so we don't conflict with libc.

Browse Source
This commit is contained in:
Uwe Hermann 2009-07-18 01:39:30 +02:00
parent cf7d4df189
commit 015b046c1e
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libopenstm32.h
View File

@ -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"

8
include/libopenstm32/common.h
View File

@ -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))

32
include/libopenstm32/stdint.h
View File

@ -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