Deleted Added
full compact
getc.c (157940) getc.c (168013)
1/*-
2 * Copyright (c) 2006 M. Warner Losh. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 17 unchanged lines hidden (view full) ---

26 *
27 * No warranty, expressed or implied, is included with this software. It is
28 * provided "AS IS" and no warranty of any kind including statutory or aspects
29 * relating to merchantability or fitness for any purpose is provided. All
30 * intellectual property rights of others is maintained with the respective
31 * owners. This software is not copyrighted and is intended for reference
32 * only.
33 *
1/*-
2 * Copyright (c) 2006 M. Warner Losh. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 17 unchanged lines hidden (view full) ---

26 *
27 * No warranty, expressed or implied, is included with this software. It is
28 * provided "AS IS" and no warranty of any kind including statutory or aspects
29 * relating to merchantability or fitness for any purpose is provided. All
30 * intellectual property rights of others is maintained with the respective
31 * owners. This software is not copyrighted and is intended for reference
32 * only.
33 *
34 * $FreeBSD: head/sys/boot/arm/at91/libat91/getc.c 157940 2006-04-21 13:58:51Z imp $
34 * $FreeBSD: head/sys/boot/arm/at91/libat91/getc.c 168013 2007-03-28 22:40:37Z imp $
35 */
36
37#include "at91rm9200.h"
38#include "at91rm9200_lowlevel.h"
39#include "lib.h"
40
41/*
42 * int getc(int seconds)
43 *
44 * Reads a character from the DBGU port, if one is available within about
45 * seconds seconds. It assumes that DBGU has already been initialized.
46 */
47int
48getc(int seconds)
49{
50 AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU;
51 unsigned thisSecond;
52
35 */
36
37#include "at91rm9200.h"
38#include "at91rm9200_lowlevel.h"
39#include "lib.h"
40
41/*
42 * int getc(int seconds)
43 *
44 * Reads a character from the DBGU port, if one is available within about
45 * seconds seconds. It assumes that DBGU has already been initialized.
46 */
47int
48getc(int seconds)
49{
50 AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU;
51 unsigned thisSecond;
52
53 // Clamp to 20s
54 if (seconds > 20)
55 seconds = 20;
53 thisSecond = GetSeconds();
54 seconds = thisSecond + seconds;
56 thisSecond = GetSeconds();
57 seconds = thisSecond + seconds;
55
56 do {
57 if ((pUSART->US_CSR & AT91C_US_RXRDY))
58 return (pUSART->US_RHR & 0xFF);
59 thisSecond = GetSeconds();
58 do {
59 if ((pUSART->US_CSR & AT91C_US_RXRDY))
60 return (pUSART->US_RHR & 0xFF);
61 thisSecond = GetSeconds();
60 } while (thisSecond < seconds);
62 } while (thisSecond != seconds);
61 return (-1);
62}
63 return (-1);
64}