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

2011-08-30 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* libchip/network/smc91111exp.h, libchip/network/smc91111.c: Use
	BSP_FEATURE_IRQ_EXTENSION define.
This commit is contained in:
Sebastian Huber
2011-08-30 13:16:35 +00:00
parent 839dc97e86
commit b907a78b7a
3 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -1,3 +1,8 @@
2011-08-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libchip/network/smc91111exp.h, libchip/network/smc91111.c: Use
BSP_FEATURE_IRQ_EXTENSION define.
2011-08-30 Peter Dufault <dufault@hda.com> 2011-08-30 Peter Dufault <dufault@hda.com>
* libchip/network/smc91111.c: Modify to support the MPC5554 using new * libchip/network/smc91111.c: Modify to support the MPC5554 using new

26
c/src/libchip/network/smc91111.c
View File

@@ -59,14 +59,14 @@
#include "smc91111config.h" #include "smc91111config.h"
#include <libchip/smc91111.h> #include <libchip/smc91111.h>
#ifdef _OLD_EXCEPTIONS #ifdef BSP_FEATURE_IRQ_EXTENSION
#include <rtems/irq-extension.h>
#else
#if defined(__m68k__) #if defined(__m68k__)
extern m68k_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); extern m68k_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
#else #else
extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
#endif #endif
#else
#include <rtems/irq-extension.h>
#endif #endif
struct lan91cxx_priv_data smc91111; struct lan91cxx_priv_data smc91111;
@@ -1072,21 +1072,25 @@ int lan91cxx_hardware_init(struct lan91cxx_priv_data *cpd)
cpd->txbusy = cpd->within_send = 0; cpd->txbusy = cpd->within_send = 0;
/* install interrupt vector */ /* install interrupt vector */
#ifdef _OLD_EXCEPTIONS #ifdef BSP_FEATURE_IRQ_EXTENSION
db_printf("Install lan91cxx irqvector at %d\n", cpd->config.vector);
set_vector(lan91cxx_interrupt_handler, cpd->config.vector, 1);
#else
{ {
int r; rtems_status_code sc = RTEMS_SUCCESSFUL;
if ((r = rtems_interrupt_handler_install(cpd->config.vector,
sc = rtems_interrupt_handler_install(
cpd->config.vector,
cpd->config.info, cpd->config.info,
cpd->config.options, cpd->config.options,
cpd->config.interrupt_wrapper, cpd->config.interrupt_wrapper,
cpd->config.arg) )) { cpd->config.arg
printf("rtems_interrupt_handler_install returned %d.\n", r); );
if (sc != RTEMS_SUCCESSFUL) {
printf("rtems_interrupt_handler_install returned %d.\n", sc);
return 0; return 0;
} }
} }
#else
db_printf("Install lan91cxx irqvector at %d\n", cpd->config.vector);
set_vector(lan91cxx_interrupt_handler, cpd->config.vector, 1);
#endif #endif
/* Reset chip */ /* Reset chip */

6
c/src/libchip/network/smc91111exp.h
View File

@@ -5,6 +5,8 @@
#ifndef _SMC91111_EXP_H_ #ifndef _SMC91111_EXP_H_
#define _SMC91111_EXP_H_ #define _SMC91111_EXP_H_
#include <bsp.h>
typedef struct scmv91111_configuration { typedef struct scmv91111_configuration {
void *baseaddr; void *baseaddr;
unsigned int vector; unsigned int vector;
@@ -12,9 +14,7 @@ typedef struct scmv91111_configuration {
unsigned int ctl_rspeed; unsigned int ctl_rspeed;
unsigned int ctl_rfduplx; unsigned int ctl_rfduplx;
unsigned int ctl_autoneg; unsigned int ctl_autoneg;
#ifndef _OLD_EXCEPTIONS #ifdef BSP_FEATURE_IRQ_EXTENSION
/* New arguments for the Interrupt Manager Extension:
*/
const char * info; const char * info;
rtems_option options; rtems_option options;
rtems_interrupt_handler interrupt_wrapper; rtems_interrupt_handler interrupt_wrapper;