diff options
author | Paul Selkirk <paul@psgd.org> | 2015-11-11 14:46:28 -0500 |
---|---|---|
committer | Paul Selkirk <paul@psgd.org> | 2015-11-11 14:46:28 -0500 |
commit | 4c6b056b8467bb6513224527ff3120ef905de397 (patch) | |
tree | bb2cc71ae6931dce7327af54b17f42591aa16f75 /libc | |
parent | df8f45c0d06e64b3901f1cce4e74cbde038737f2 (diff) |
Lots of cleanup.
Clean up and simplify(?) Makefile.
Add copyrights as needed.
Add include guard to stm-fmc.h.
Move MX_USART2_UART_Init back to stm-init.c for possible copyright reasons.
Move libc, src, and include files to top level.
Diffstat (limited to 'libc')
-rw-r--r-- | libc/gettimeofday.c | 26 | ||||
-rw-r--r-- | libc/printf.c | 395 | ||||
-rw-r--r-- | libc/syscalls.c | 195 |
3 files changed, 0 insertions, 616 deletions
diff --git a/libc/gettimeofday.c b/libc/gettimeofday.c deleted file mode 100644 index b0561c3..0000000 --- a/libc/gettimeofday.c +++ /dev/null @@ -1,26 +0,0 @@ -#include <stdint.h> - -#include "stm32f4xx_hal.h" - -/* Don't #include <sys/time.h> because of conflicting prototype in newlib. */ - -/* from the manpage: */ -struct timeval { - time_t tv_sec; /* seconds */ - suseconds_t tv_usec; /* microseconds */ -}; - -struct timezone { - int tz_minuteswest; /* minutes west of Greenwich */ - int tz_dsttime; /* type of DST correction */ -}; - -int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - uint32_t tick = HAL_GetTick(); /* uptime in ms */ - - tv->tv_sec = tick / 1000; - tv->tv_usec = (tick % 1000) * 1000; - - return 0; -} diff --git a/libc/printf.c b/libc/printf.c deleted file mode 100644 index a6153d8..0000000 --- a/libc/printf.c +++ /dev/null @@ -1,395 +0,0 @@ -/*****************************************************************************
-Stripped-down printf()
-Chris Giese <geezer@execpc.com> http://my.execpc.com/~geezer
-Release date: Dec 12, 2003
-This code is public domain (no copyright).
-You can do whatever you want with it.
-
-Revised Dec 12, 2003
-- fixed vsprintf() and sprintf() in test code
-
-Revised Jan 28, 2002
-- changes to make characters 0x80-0xFF display properly
-
-Revised June 10, 2001
-- changes to make vsprintf() terminate string with '\0'
-
-Revised May 12, 2000
-- math in DO_NUM is now unsigned, as it should be
-- %0 flag (pad left with zeroes) now works
-- actually did some TESTING, maybe fixed some other bugs
-
-%[flag][width][.prec][mod][conv]
-flag: - left justify, pad right w/ blanks DONE
- 0 pad left w/ 0 for numerics DONE
- + always print sign, + or - no
- ' ' (blank) no
- # (???) no
-
-width: (field width) DONE
-
-prec: (precision) no
-
-conv: d,i decimal int DONE
- u decimal unsigned DONE
- o octal DONE
- x,X hex DONE
- f,e,g,E,G float no
- c char DONE
- s string DONE
- p ptr DONE
-
-mod: N near ptr DONE
- F far ptr no
- h short (16-bit) int DONE
- l long (32-bit) int DONE
- L long long (64-bit) int no
-*****************************************************************************/
-#include <string.h> /* strlen() */
-#include <stdio.h> /* stdout, putchar(), fputs() (but not printf() :) */
-#undef putchar
-
-#include <stdarg.h> /* va_list, va_start(), va_arg(), va_end() */
-
-/* flags used in processing format string */
-#define PR_LJ 0x01 /* left justify */
-#define PR_CA 0x02 /* use A-F instead of a-f for hex */
-#define PR_SG 0x04 /* signed numeric conversion (%d vs. %u) */
-#define PR_32 0x08 /* long (32-bit) numeric conversion */
-#define PR_16 0x10 /* short (16-bit) numeric conversion */
-#define PR_WS 0x20 /* PR_SG set and num was < 0 */
-#define PR_LZ 0x40 /* pad left with '0' instead of ' ' */
-#define PR_FP 0x80 /* pointers are far */
-/* largest number handled is 2^64-1, lowest radix handled is 8.
-2^64-1 in base 8 has 22 digits (add 2 for trailing NUL and for slop) */
-#define PR_BUFLEN 24
-
-typedef int (*fnptr_t)(unsigned c, void **helper);
-/*****************************************************************************
-name: do_printf
-action: minimal subfunction for ?printf, calls function
- 'fn' with arg 'ptr' for each character to be output
-returns:total number of characters output
-*****************************************************************************/
-int do_printf(const char *fmt, va_list args, fnptr_t fn, void *ptr)
-{
- unsigned flags, actual_wd, count, given_wd;
- unsigned char *where, buf[PR_BUFLEN];
- unsigned char state, radix;
- long num;
-
- state = flags = count = given_wd = 0;
-/* begin scanning format specifier list */
- for(; *fmt; fmt++)
- {
- switch(state)
- {
-/* STATE 0: AWAITING % */
- case 0:
- if(*fmt != '%') /* not %... */
- {
- fn(*fmt, &ptr); /* ...just echo it */
- count++;
- break;
- }
-/* found %, get next char and advance state to check if next char is a flag */
- state++;
- fmt++;
- /* FALL THROUGH */
-/* STATE 1: AWAITING FLAGS (%-0) */
- case 1:
- if(*fmt == '%') /* %% */
- {
- fn(*fmt, &ptr);
- count++;
- state = flags = given_wd = 0;
- break;
- }
- if(*fmt == '-')
- {
- if(flags & PR_LJ)/* %-- is illegal */
- state = flags = given_wd = 0;
- else
- flags |= PR_LJ;
- break;
- }
-/* not a flag char: advance state to check if it's field width */
- state++;
-/* check now for '%0...' */
- if(*fmt == '0')
- {
- flags |= PR_LZ;
- fmt++;
- }
- /* FALL THROUGH */
-/* STATE 2: AWAITING (NUMERIC) FIELD WIDTH */
- case 2:
- if(*fmt >= '0' && *fmt <= '9')
- {
- given_wd = 10 * given_wd +
- (*fmt - '0');
- break;
- }
-/* not field width: advance state to check if it's a modifier */
- state++;
- /* FALL THROUGH */
-/* STATE 3: AWAITING MODIFIER CHARS (FNlh) */
- case 3:
- if(*fmt == 'F')
- {
- flags |= PR_FP;
- break;
- }
- if(*fmt == 'N')
- break;
- if(*fmt == 'l')
- {
- flags |= PR_32;
- break;
- }
- if(*fmt == 'h')
- {
- flags |= PR_16;
- break;
- }
-/* not modifier: advance state to check if it's a conversion char */
- state++;
- /* FALL THROUGH */
-/* STATE 4: AWAITING CONVERSION CHARS (Xxpndiuocs) */
- case 4:
- where = buf + PR_BUFLEN - 1;
- *where = '\0';
- switch(*fmt)
- {
- case 'X':
- flags |= PR_CA;
- /* FALL THROUGH */
-/* xxx - far pointers (%Fp, %Fn) not yet supported */
- case 'x':
- case 'p':
- case 'n':
- radix = 16;
- goto DO_NUM;
- case 'd':
- case 'i':
- flags |= PR_SG;
- /* FALL THROUGH */
- case 'u':
- radix = 10;
- goto DO_NUM;
- case 'o':
- radix = 8;
-/* load the value to be printed. l=long=32 bits: */
-DO_NUM: if(flags & PR_32)
- num = va_arg(args, unsigned long);
-/* h=short=16 bits (signed or unsigned) */
- else if(flags & PR_16)
- {
- num = va_arg(args, int);
- if(flags & PR_SG)
- num = (short) num;
- else
- num = (unsigned short) num;
- }
-/* no h nor l: sizeof(int) bits (signed or unsigned) */
- else
- {
- if(flags & PR_SG)
- num = va_arg(args, int);
- else
- num = va_arg(args, unsigned int);
- }
-/* take care of sign */
- if(flags & PR_SG)
- {
- if(num < 0)
- {
- flags |= PR_WS;
- num = -num;
- }
- }
-/* convert binary to octal/decimal/hex ASCII
-OK, I found my mistake. The math here is _always_ unsigned */
- do
- {
- unsigned long temp;
-
- temp = (unsigned long)num % radix;
- where--;
- if(temp < 10)
- *where = temp + '0';
- else if(flags & PR_CA)
- *where = temp - 10 + 'A';
- else
- *where = temp - 10 + 'a';
- num = (unsigned long)num / radix;
- }
- while(num != 0);
- goto EMIT;
- case 'c':
-/* disallow pad-left-with-zeroes for %c */
- flags &= ~PR_LZ;
- where--;
- *where = (unsigned char)va_arg(args, int);
- actual_wd = 1;
- goto EMIT2;
- case 's':
-/* disallow pad-left-with-zeroes for %s */
- flags &= ~PR_LZ;
- where = va_arg(args, unsigned char *);
-EMIT:
- actual_wd = strlen((const char *)where);
- if(flags & PR_WS)
- actual_wd++;
-/* if we pad left with ZEROES, do the sign now */
- if((flags & (PR_WS | PR_LZ)) ==
- (PR_WS | PR_LZ))
- {
- fn('-', &ptr);
- count++;
- }
-/* pad on left with spaces or zeroes (for right justify) */
-EMIT2: if((flags & PR_LJ) == 0)
- {
- while(given_wd > actual_wd)
- {
- fn(flags & PR_LZ ?
- '0' : ' ', &ptr);
- count++;
- given_wd--;
- }
- }
-/* if we pad left with SPACES, do the sign now */
- if((flags & (PR_WS | PR_LZ)) == PR_WS)
- {
- fn('-', &ptr);
- count++;
- }
-/* emit string/char/converted number */
- while(*where != '\0')
- {
- fn(*where++, &ptr);
- count++;
- }
-/* pad on right with spaces (for left justify) */
- if(given_wd < actual_wd)
- given_wd = 0;
- else given_wd -= actual_wd;
- for(; given_wd; given_wd--)
- {
- fn(' ', &ptr);
- count++;
- }
- break;
- default:
- break;
- }
- default:
- state = flags = given_wd = 0;
- break;
- }
- }
- return count;
-}
-
-/*****************************************************************************
-SPRINTF
-*****************************************************************************/
-static int vsprintf_help(unsigned c, void **ptr)
-{
- char *dst;
-
- dst = *ptr;
- *dst++ = (char)c;
- *ptr = dst;
- return 0 ;
-}
-/*****************************************************************************
-*****************************************************************************/
-int vsprintf(char *buf, const char *fmt, va_list args)
-{
- int rv;
-
- rv = do_printf(fmt, args, vsprintf_help, (void *)buf);
- buf[rv] = '\0';
- return rv;
-}
-/*****************************************************************************
-*****************************************************************************/
-int sprintf(char *buf, const char *fmt, ...)
-{
- va_list args;
- int rv;
-
- va_start(args, fmt);
- rv = vsprintf(buf, fmt, args);
- va_end(args);
- return rv;
-}
-/*****************************************************************************
-PRINTF
-You must write your own putchar()
-*****************************************************************************/
-int vprintf_help(unsigned c, void **ptr)
-{
- putchar(c);
- return 0 ;
-}
-/*****************************************************************************
-*****************************************************************************/
-int vprintf(const char *fmt, va_list args)
-{
- return do_printf(fmt, args, vprintf_help, NULL);
-}
-/*****************************************************************************
-*****************************************************************************/
-int printf(const char *fmt, ...)
-{
- va_list args;
- int rv;
-
- va_start(args, fmt);
- rv = vprintf(fmt, args);
- va_end(args);
- return rv;
-}
-
-#if 0 /* testing */
-/*****************************************************************************
-*****************************************************************************/
-int main(void)
-{
- char buf[64];
-
- sprintf(buf, "%lu score and %i years ago...\n", 4L, -7);
- fputs(buf, stdout); /* puts() adds newline */
-
- sprintf(buf, "-1L == 0x%lX == octal %lo\n", -1L, -1L);
- fputs(buf, stdout); /* puts() adds newline */
-
- printf("<%-8s> and <%8s> justified strings\n", "left", "right");
-
- printf("short signed: %hd, short unsigned: %hu\n", -1, -1);
- return 0;
-}
-#else
-
-/*****************************************************************************
-2015-10-29 pselkirk for cryptech
-*****************************************************************************/
-/* gcc decides that a plain string with no formatting is best handled by puts() */
-int puts(const char *s)
-{
- return printf("%s\n", s);
-}
-
-/* transmit characters to the uart */
-#include "stm-uart.h"
-int putchar(int c)
-{
- if (c == '\n')
- uart_send_char('\r');
- uart_send_char((uint8_t) c);
- return c;
-}
-#endif
diff --git a/libc/syscalls.c b/libc/syscalls.c deleted file mode 100644 index 9212763..0000000 --- a/libc/syscalls.c +++ /dev/null @@ -1,195 +0,0 @@ -/**************************************************************************** -* Copyright (c) 2009 by Michael Fischer. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* 3. Neither the name of the author nor the names of its contributors may -* be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -* SUCH DAMAGE. -* -**************************************************************************** -* History: -* -* 28.03.09 mifi First Version, based on the original syscall.c from -* newlib version 1.17.0 -****************************************************************************/ - -/* 2015-10-29 pselkirk for cryptech: - * Changed asm to __asm for c99 compatibility. - * Added _exit, _kill, and _getpid from mifi's 2013 revision. - */ - -#include <stdlib.h> -#include <errno.h> -#include <string.h> -#include <sys/stat.h> -#include <sys/types.h> - -/***************************************************************************/ - -int _read_r (struct _reent *r, int file, char * ptr, int len) -{ - r = r; - file = file; - ptr = ptr; - len = len; - - errno = EINVAL; - return -1; -} - -/***************************************************************************/ - -int _lseek_r (struct _reent *r, int file, int ptr, int dir) -{ - r = r; - file = file; - ptr = ptr; - dir = dir; - - return 0; -} - -/***************************************************************************/ - -int _write_r (struct _reent *r, int file, char * ptr, int len) -{ - r = r; - file = file; - ptr = ptr; - -#if 0 - int index; - - /* For example, output string by UART */ - for(index=0; index<len; index++) - { - if (ptr[index] == '\n') - { - uart_putc('\r'); - } - - uart_putc(ptr[index]); - } -#endif - - return len; -} - -/***************************************************************************/ - -int _close_r (struct _reent *r, int file) -{ - return 0; -} - -/***************************************************************************/ - -/* Register name faking - works in collusion with the linker. */ -register char * stack_ptr __asm ("sp"); - -caddr_t _sbrk_r (struct _reent *r, int incr) -{ - extern char end __asm ("end"); /* Defined by the linker. */ - static char * heap_end; - char * prev_heap_end; - - if (heap_end == NULL) - heap_end = & end; - - prev_heap_end = heap_end; - - if (heap_end + incr > stack_ptr) - { - /* Some of the libstdc++-v3 tests rely upon detecting - out of memory errors, so do not abort here. */ -#if 0 - extern void abort (void); - - _write (1, "_sbrk: Heap and stack collision\n", 32); - - abort (); -#else - errno = ENOMEM; - return (caddr_t) -1; -#endif - } - - heap_end += incr; - - return (caddr_t) prev_heap_end; -} - -/***************************************************************************/ - -int _fstat_r (struct _reent *r, int file, struct stat * st) -{ - r = r; - file = file; - - memset (st, 0, sizeof (* st)); - st->st_mode = S_IFCHR; - return 0; -} - -/***************************************************************************/ - -int _isatty_r(struct _reent *r, int fd) -{ - r = r; - fd = fd; - - return 1; -} - -/***************************************************************************/ - -void _exit (int a) -{ - a = a; - - while(1) {}; -} - -/***************************************************************************/ - -int _kill (int a, int b) -{ - a = a; - b = b; - - return 0; -} - -/***************************************************************************/ - -int _getpid(int a) -{ - a = a; - - return 0; -} - -/*** EOF ***/ - - |