forked from Imagelibrary/rtems
The word "RTEMS" almost completely removed from the core.
Configuration Table Template file added and all tests modified to use this. All gvar.h and conftbl.h files removed from test directories. Configuration parameter maximum_devices added. Core semaphore and mutex handlers added and RTEMS API Semaphore Manager updated to reflect this. Initialization sequence changed to invoke API specific initialization routines. Initialization tasks table now owned by RTEMS Tasks Manager. Added user extension for post-switch. Utilized user extensions to implement API specific functionality like signal dispatching. Added extensions to the System Initialization Thread so that an API can register a function to be invoked while the system is being initialized. These are largely equivalent to the pre-driver and post-driver hooks. Added the Modules file oar-go32_p5, modified oar-go32, and modified the file make/custom/go32.cfg to look at an environment varable which determines what CPU model is being used. All BSPs updated to reflect named devices and clock driver's IOCTL used by the Shared Memory Driver. Also merged clock isr into main file and removed ckisr.c where possible. Updated spsize to reflect new and moved variables. Makefiles for the executive source and include files updated to show break down of files into Core, RTEMS API, and Neither. Header and inline files installed into subdirectory based on whether logically in the Core or a part of the RTEMS API.
This commit is contained in:
@@ -33,6 +33,7 @@
|
||||
|
||||
#include <bsp.h>
|
||||
#include <clockdrv.h>
|
||||
#include <rtems/libio.h>
|
||||
|
||||
#include <stdlib.h> /* for atexit() */
|
||||
|
||||
@@ -42,32 +43,15 @@ volatile rtems_unsigned32 Clock_driver_ticks;
|
||||
static rtems_unsigned32 pit_value, tick_time;
|
||||
static rtems_boolean auto_restart;
|
||||
|
||||
rtems_device_driver Clock_initialize(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void *pargp,
|
||||
rtems_id tid,
|
||||
rtems_unsigned32 *rval
|
||||
)
|
||||
{
|
||||
Install_clock(Clock_isr);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ReInstall_clock(rtems_isr_entry new_clock_isr)
|
||||
{
|
||||
rtems_isr_entry previous_isr;
|
||||
rtems_unsigned32 isrlevel = 0;
|
||||
|
||||
rtems_interrupt_disable(isrlevel);
|
||||
|
||||
rtems_interrupt_catch(new_clock_isr, PPC_IRQ_PIT,
|
||||
&previous_isr);
|
||||
|
||||
rtems_interrupt_enable(isrlevel);
|
||||
}
|
||||
|
||||
void Clock_exit( void );
|
||||
|
||||
/*
|
||||
* These are set by clock driver during its init
|
||||
*/
|
||||
|
||||
rtems_device_major_number rtems_clock_major = ~0;
|
||||
rtems_device_minor_number rtems_clock_minor;
|
||||
|
||||
static INLINE rtems_unsigned32 get_itimer(void)
|
||||
{
|
||||
register rtems_unsigned32 rc;
|
||||
@@ -77,61 +61,10 @@ static INLINE rtems_unsigned32 get_itimer(void)
|
||||
return rc;
|
||||
}
|
||||
|
||||
void Install_clock(rtems_isr_entry clock_isr)
|
||||
{
|
||||
rtems_isr_entry previous_isr;
|
||||
rtems_unsigned32 pvr, iocr;
|
||||
|
||||
Clock_driver_ticks = 0;
|
||||
|
||||
asm volatile ("mfiocr %0" : "=r" (iocr));
|
||||
iocr &= ~4;
|
||||
iocr |= 4; /* Select external timer clock */
|
||||
asm volatile ("mtiocr %0" : "=r" (iocr) : "0" (iocr));
|
||||
|
||||
asm volatile ("mfpvr %0" : "=r" ((pvr)));
|
||||
|
||||
if (((pvr & 0xffff0000) >> 16) != 0x0020)
|
||||
return; /* Not a ppc403 */
|
||||
|
||||
if ((pvr & 0xff00) == 0x0000) /* 403GA */
|
||||
auto_restart = (pvr & 0x00f0) > 0x0000 ? 1 : 0;
|
||||
else if ((pvr & 0xff00) == 0x0100) /* 403GB */
|
||||
auto_restart = 1;
|
||||
|
||||
pit_value = BSP_Configuration.microseconds_per_tick *
|
||||
Cpu_table.clicks_per_usec;
|
||||
|
||||
if (BSP_Configuration.ticks_per_timeslice)
|
||||
{
|
||||
register rtems_unsigned32 tcr;
|
||||
/*
|
||||
* initialize the interval here
|
||||
* First tick is set to right amount of time in the future
|
||||
* Future ticks will be incremented over last value set
|
||||
* in order to provide consistent clicks in the face of
|
||||
* interrupt overhead
|
||||
*/
|
||||
|
||||
rtems_interrupt_catch(clock_isr, PPC_IRQ_PIT,
|
||||
&previous_isr);
|
||||
|
||||
asm volatile ("mtpit %0" : : "r" (pit_value));
|
||||
|
||||
asm volatile ("mftcr %0" : "=r" ((tcr)));
|
||||
|
||||
tcr &= ~ 0x04400000;
|
||||
|
||||
tcr |= (auto_restart ? 0x04400000 : 0x04000000);
|
||||
|
||||
tick_time = get_itimer() + pit_value;
|
||||
|
||||
asm volatile ("mttcr %0" : "=r" ((tcr)) : "0" ((tcr)));
|
||||
}
|
||||
atexit(Clock_exit);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* ISR Handler
|
||||
*/
|
||||
|
||||
rtems_isr
|
||||
Clock_isr(rtems_vector_number vector)
|
||||
{
|
||||
@@ -191,6 +124,75 @@ Clock_isr(rtems_vector_number vector)
|
||||
rtems_clock_tick();
|
||||
}
|
||||
|
||||
void Install_clock(rtems_isr_entry clock_isr)
|
||||
{
|
||||
rtems_isr_entry previous_isr;
|
||||
rtems_unsigned32 pvr, iocr;
|
||||
|
||||
Clock_driver_ticks = 0;
|
||||
|
||||
asm volatile ("mfiocr %0" : "=r" (iocr));
|
||||
iocr &= ~4;
|
||||
iocr |= 4; /* Select external timer clock */
|
||||
asm volatile ("mtiocr %0" : "=r" (iocr) : "0" (iocr));
|
||||
|
||||
asm volatile ("mfpvr %0" : "=r" ((pvr)));
|
||||
|
||||
if (((pvr & 0xffff0000) >> 16) != 0x0020)
|
||||
return; /* Not a ppc403 */
|
||||
|
||||
if ((pvr & 0xff00) == 0x0000) /* 403GA */
|
||||
auto_restart = (pvr & 0x00f0) > 0x0000 ? 1 : 0;
|
||||
else if ((pvr & 0xff00) == 0x0100) /* 403GB */
|
||||
auto_restart = 1;
|
||||
|
||||
pit_value = BSP_Configuration.microseconds_per_tick *
|
||||
Cpu_table.clicks_per_usec;
|
||||
|
||||
if (BSP_Configuration.ticks_per_timeslice)
|
||||
{
|
||||
register rtems_unsigned32 tcr;
|
||||
/*
|
||||
* initialize the interval here
|
||||
* First tick is set to right amount of time in the future
|
||||
* Future ticks will be incremented over last value set
|
||||
* in order to provide consistent clicks in the face of
|
||||
* interrupt overhead
|
||||
*/
|
||||
|
||||
rtems_interrupt_catch(clock_isr, PPC_IRQ_PIT,
|
||||
&previous_isr);
|
||||
|
||||
asm volatile ("mtpit %0" : : "r" (pit_value));
|
||||
|
||||
asm volatile ("mftcr %0" : "=r" ((tcr)));
|
||||
|
||||
tcr &= ~ 0x04400000;
|
||||
|
||||
tcr |= (auto_restart ? 0x04400000 : 0x04000000);
|
||||
|
||||
tick_time = get_itimer() + pit_value;
|
||||
|
||||
asm volatile ("mttcr %0" : "=r" ((tcr)) : "0" ((tcr)));
|
||||
}
|
||||
atexit(Clock_exit);
|
||||
}
|
||||
|
||||
void
|
||||
ReInstall_clock(rtems_isr_entry new_clock_isr)
|
||||
{
|
||||
rtems_isr_entry previous_isr;
|
||||
rtems_unsigned32 isrlevel = 0;
|
||||
|
||||
rtems_interrupt_disable(isrlevel);
|
||||
|
||||
rtems_interrupt_catch(new_clock_isr, PPC_IRQ_PIT,
|
||||
&previous_isr);
|
||||
|
||||
rtems_interrupt_enable(isrlevel);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Called via atexit()
|
||||
* Remove the clock interrupt handler by setting handler to NULL
|
||||
@@ -213,3 +215,50 @@ Clock_exit(void)
|
||||
}
|
||||
}
|
||||
|
||||
rtems_device_driver Clock_initialize(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void *pargp
|
||||
)
|
||||
{
|
||||
Install_clock( Clock_isr );
|
||||
|
||||
/*
|
||||
* make major/minor avail to others such as shared memory driver
|
||||
*/
|
||||
|
||||
rtems_clock_major = major;
|
||||
rtems_clock_minor = minor;
|
||||
|
||||
return RTEMS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
rtems_device_driver Clock_control(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void *pargp
|
||||
)
|
||||
{
|
||||
rtems_libio_ioctl_args_t *args = pargp;
|
||||
|
||||
if (args == 0)
|
||||
goto done;
|
||||
|
||||
/*
|
||||
* This is hokey, but until we get a defined interface
|
||||
* to do this, it will just be this simple...
|
||||
*/
|
||||
|
||||
if (args->command == rtems_build_name('I', 'S', 'R', ' '))
|
||||
{
|
||||
Clock_isr(PPC_IRQ_PIT);
|
||||
}
|
||||
else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
|
||||
{
|
||||
ReInstall_clock(args->buffer);
|
||||
}
|
||||
|
||||
done:
|
||||
return RTEMS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,9 +31,8 @@
|
||||
|
||||
#define NO_BSP_INIT
|
||||
|
||||
#include <rtems.h>
|
||||
#include "console.h"
|
||||
#include "bsp.h"
|
||||
#include <bsp.h>
|
||||
#include <rtems/libio.h>
|
||||
|
||||
extern rtems_cpu_table Cpu_table; /* owned by BSP */
|
||||
|
||||
@@ -139,11 +138,10 @@ static const pasync port = (pasync)0x40000000;
|
||||
rtems_device_driver console_initialize(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void *arg,
|
||||
rtems_id self,
|
||||
rtems_unsigned32 *status
|
||||
void *arg
|
||||
)
|
||||
{
|
||||
rtems_status_code status;
|
||||
register unsigned tmp;
|
||||
|
||||
/* Initialise the serial port */
|
||||
@@ -164,7 +162,16 @@ rtems_device_driver console_initialize(
|
||||
port->SPTC = (TCREnable | TCRIntDisable);
|
||||
port->SPHS = (HSRDsr | HSRCts);
|
||||
|
||||
*status = RTEMS_SUCCESSFUL;
|
||||
status = rtems_io_register_name(
|
||||
"/dev/console",
|
||||
major,
|
||||
(rtems_device_minor_number) 0
|
||||
);
|
||||
|
||||
if (status != RTEMS_SUCCESSFUL)
|
||||
rtems_fatal_error_occurred(status);
|
||||
|
||||
return RTEMS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
|
||||
@@ -280,48 +287,103 @@ void outbyte(
|
||||
}
|
||||
|
||||
/*
|
||||
* __read -- read bytes from the serial port. Ignore fd, since
|
||||
* we only have stdin.
|
||||
* Open entry point
|
||||
*/
|
||||
|
||||
int __read(
|
||||
int fd,
|
||||
char *buf,
|
||||
int nbytes
|
||||
|
||||
rtems_device_driver console_open(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void * arg
|
||||
)
|
||||
{
|
||||
int i = 0;
|
||||
|
||||
for (i = 0; i < nbytes; i++) {
|
||||
*(buf + i) = inbyte();
|
||||
if ((*(buf + i) == '\n') || (*(buf + i) == '\r')) {
|
||||
(*(buf + i++)) = '\n';
|
||||
(*(buf + i)) = 0;
|
||||
return RTEMS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Close entry point
|
||||
*/
|
||||
|
||||
rtems_device_driver console_close(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void * arg
|
||||
)
|
||||
{
|
||||
return RTEMS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
/*
|
||||
* read bytes from the serial port. We only have stdin.
|
||||
*/
|
||||
|
||||
rtems_device_driver console_read(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void * arg
|
||||
)
|
||||
{
|
||||
rtems_libio_rw_args_t *rw_args;
|
||||
char *buffer;
|
||||
int maximum;
|
||||
int count = 0;
|
||||
|
||||
rw_args = (rtems_libio_rw_args_t *) arg;
|
||||
|
||||
buffer = rw_args->buffer;
|
||||
maximum = rw_args->count;
|
||||
|
||||
for (count = 0; count < maximum; count++) {
|
||||
buffer[ count ] = inbyte();
|
||||
if (buffer[ count ] == '\n' || buffer[ count ] == '\r') {
|
||||
buffer[ count++ ] = '\n';
|
||||
buffer[ count ] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return (i);
|
||||
|
||||
rw_args->bytes_moved = count;
|
||||
return (count >= 0) ? RTEMS_SUCCESSFUL : RTEMS_UNSATISFIED;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* __write -- write bytes to the serial port. Ignore fd, since
|
||||
* stdout and stderr are the same. Since we have no filesystem,
|
||||
* open will only return an error.
|
||||
* write bytes to the serial port. Stdout and stderr are the same.
|
||||
*/
|
||||
|
||||
int __write(
|
||||
int fd,
|
||||
char *buf,
|
||||
int nbytes
|
||||
|
||||
rtems_device_driver console_write(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void * arg
|
||||
)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < nbytes; i++) {
|
||||
if (*(buf + i) == '\n') {
|
||||
outbyte ('\r');
|
||||
int count;
|
||||
int maximum;
|
||||
rtems_libio_rw_args_t *rw_args;
|
||||
char *buffer;
|
||||
|
||||
rw_args = (rtems_libio_rw_args_t *) arg;
|
||||
|
||||
buffer = rw_args->buffer;
|
||||
maximum = rw_args->count;
|
||||
|
||||
for (count = 0; count < maximum; count++) {
|
||||
if ( buffer[ count ] == '\n') {
|
||||
outbyte('\r');
|
||||
}
|
||||
outbyte (*(buf + i));
|
||||
outbyte( buffer[ count ] );
|
||||
}
|
||||
return (nbytes);
|
||||
return maximum;
|
||||
}
|
||||
|
||||
/*
|
||||
* IO Control entry point
|
||||
*/
|
||||
|
||||
rtems_device_driver console_control(
|
||||
rtems_device_major_number major,
|
||||
rtems_device_minor_number minor,
|
||||
void * arg
|
||||
)
|
||||
{
|
||||
return RTEMS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user