RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsp/pc386: Use irq-generic.

Browse Source
This commit is contained in:
Chris Johns
2016-05-06 17:51:26 +10:00
parent b61f58fc2c
commit beefa11201
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/i386/pc386/clock/ckinit.c
View File

@@ -24,7 +24,7 @@
*/ */
#include <bsp.h> #include <bsp.h>
#include <bsp/irq.h> #include <bsp/irq-generic.h>
#include <bspopts.h> #include <bspopts.h>
#include <libcpu/cpuModel.h> #include <libcpu/cpuModel.h>
#include <assert.h> #include <assert.h>
@@ -150,7 +150,7 @@ static void clockOn(void)
} }
pc386_clock_click_count = US_TO_TICK(pc386_microseconds_per_isr); pc386_clock_click_count = US_TO_TICK(pc386_microseconds_per_isr);
BSP_irq_enable_at_i8259s( BSP_PERIODIC_TIMER - BSP_IRQ_VECTOR_BASE ); bsp_interrupt_vector_enable( BSP_PERIODIC_TIMER - BSP_IRQ_VECTOR_BASE );
#if 0 #if 0
printk( "configured usecs per tick=%d \n", printk( "configured usecs per tick=%d \n",
@@ -256,4 +256,3 @@ void Clock_driver_support_initialize_hardware(void)
} while (0) } while (0)
#include "../../../shared/clockdrv_shell.h" #include "../../../shared/clockdrv_shell.h"

10
c/src/lib/libbsp/i386/pc386/timer/timer.c
View File

@@ -16,7 +16,7 @@
* This file is provided "AS IS" without warranty of any kind, either * This file is provided "AS IS" without warranty of any kind, either
* expressed or implied. * expressed or implied.
* *
* Based upon code by * Based upon code by
* COPYRIGHT (c) 1989-1999. * COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR). * On-Line Applications Research Corporation (OAR).
* *
@@ -28,7 +28,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <bsp.h> #include <bsp.h>
#include <rtems/btimer.h> #include <rtems/btimer.h>
#include <bsp/irq.h> #include <bsp/irq-generic.h>
#include <libcpu/cpuModel.h> #include <libcpu/cpuModel.h>
/* /*
@@ -118,7 +118,7 @@ static void timerOff(const rtems_raw_irq_connect_data* used)
/* /*
* disable interrrupt at i8259 level * disable interrrupt at i8259 level
*/ */
BSP_irq_disable_at_i8259s(used->idtIndex - BSP_IRQ_VECTOR_BASE); bsp_interrupt_vector_disable(used->idtIndex - BSP_IRQ_VECTOR_BASE);
/* reset timer mode to standard (DOS) value */ /* reset timer mode to standard (DOS) value */
outport_byte(TIMER_MODE, TIMER_SEL0|TIMER_16BIT|TIMER_RATEGEN); outport_byte(TIMER_MODE, TIMER_SEL0|TIMER_16BIT|TIMER_RATEGEN);
outport_byte(TIMER_CNTR0, 0); outport_byte(TIMER_CNTR0, 0);
@@ -135,12 +135,12 @@ static void timerOn(const rtems_raw_irq_connect_data* used)
/* /*
* enable interrrupt at i8259 level * enable interrrupt at i8259 level
*/ */
BSP_irq_enable_at_i8259s(used->idtIndex - BSP_IRQ_VECTOR_BASE); bsp_interrupt_vector_enable(used->idtIndex - BSP_IRQ_VECTOR_BASE);
} }
static int timerIsOn(const rtems_raw_irq_connect_data *used) static int timerIsOn(const rtems_raw_irq_connect_data *used)
{ {
return BSP_irq_enabled_at_i8259s(used->idtIndex - BSP_IRQ_VECTOR_BASE); return bsp_interrupt_vector_enable(used->idtIndex - BSP_IRQ_VECTOR_BASE);
} }
static rtems_raw_irq_connect_data timer_raw_irq_data = { static rtems_raw_irq_connect_data timer_raw_irq_data = {