Implement a very crude busy-wait based select() mechanism for consol input.

--HG--
branch : dtrg-videocore
rename : plat/rpi/include/ack/config.h => plat/rpi/include/sys/select.h
rename : plat/rpi/libsys/time.c => plat/rpi/libsys/select.c
This commit is contained in:
David Given 2013-06-09 22:16:30 +01:00
parent bbd4b46850
commit eaf4339cd6
6 changed files with 107 additions and 1 deletions

View file

@ -36,7 +36,8 @@ platform-libsys := \
time.c \ time.c \
signal.c \ signal.c \
tcgetattr.c \ tcgetattr.c \
tcsetattr.c tcsetattr.c \
select.c
$(eval $(call build-platform)) $(eval $(call build-platform))

View file

@ -0,0 +1,13 @@
/*
* Raspberry Pi support library for the ACK
* © 2013 David Given
* This file is redistributable under the terms of the 3-clause BSD license.
* See the file 'Copying' in the root of the distribution for the full text.
*/
#ifndef _SYS_SELECT_H
#define _SYS_SELECT_H
#include <unistd.h>
#endif

View file

@ -90,4 +90,16 @@ typedef void (*sighandler_t)(int);
extern sighandler_t signal(int signum, sighandler_t handler); extern sighandler_t signal(int signum, sighandler_t handler);
extern int raise(int signum); extern int raise(int signum);
/* Select */
typedef uint32_t fd_set;
extern int select(int nfds, fd_set *readfds, fd_set *writefds,
fd_set *exceptfds, struct timeval *timeout);
#define FD_ZERO(set) do { *set = 0; } while (0)
#define FD_SET(fd, set) do { *set |= (1<<fd); } while (0);
#define FD_CLR(fd, set) do { *set &= ~(1<<fd); } while (0);
#define FD_ISSET(fd, set) (*set | (1<<fd))
#endif #endif

View file

@ -10,6 +10,7 @@
extern void _sys_rawwrite(unsigned char b); extern void _sys_rawwrite(unsigned char b);
extern unsigned char _sys_rawread(void); extern unsigned char _sys_rawread(void);
extern int _sys_rawpoll(void);
extern void _sys_write_tty(char c); extern void _sys_write_tty(char c);

View file

@ -141,6 +141,20 @@ sendwait:
1: 1:
b lr b lr
! Poll to see if there's incoming data available.
.define __sys_rawpoll
.define __sys_rawpoll
__sys_rawpoll:
ldb r0, __uart_status
b.eq r0, #0, 1b
mov r1, #AUX_MU_LSR_REG
ld r0, (r1)
and r0, #0x1 ! 0 if no data, 1 if data
1:
b lr
! Receive a single byte. ! Receive a single byte.
.define __sys_rawread .define __sys_rawread

65
plat/rpi/libsys/select.c Normal file
View file

@ -0,0 +1,65 @@
/*
* Raspberry Pi support library for the ACK
* © 2013 David Given
* This file is redistributable under the terms of the 3-clause BSD license.
* See the file 'Copying' in the root of the distribution for the full text.
*/
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <time.h>
#include <pi.h>
#include "libsys.h"
#define TICKS_PER_SEC 1000000
typedef int condition_t(void);
static int nop_condition(void)
{
return 0;
}
int select(int nfds, fd_set *readfds, fd_set *writefds,
fd_set *exceptfds, struct timeval *timeout)
{
int result = 0;
condition_t* condition = nop_condition;
if (FD_ISSET(0, readfds))
condition = _sys_rawpoll;
FD_ZERO(readfds);
FD_ZERO(writefds);
FD_ZERO(exceptfds);
if (timeout)
{
/* Wait for a specified amount of time. */
uint32_t ticks = (timeout->tv_sec * TICKS_PER_SEC) +
(timeout->tv_usec * (TICKS_PER_SEC/1000000));
uint32_t* timer_clo = pi_phys_to_user((void*) 0x7e003004);
uint32_t ra = *timer_clo;
while (!condition() && ((*timer_clo - ra) < ticks))
;
}
else
{
/* Wait forever. */
while (!condition())
;
}
if ((condition == _sys_rawpoll) && condition())
{
FD_SET(0, readfds);
result = 1;
}
return result;
}