Changeset 2d7d605 in rtems


Ignore:
Timestamp:
Aug 19, 1998, 2:41:23 PM (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
0375c72
Parents:
06fa582
Message:

Patch from Aleksey <qqi@…>:

It fixes netboot build problem, KA9Q configuration
for pc386, some compiler wardning, it also removed some stuff
ifdef'ed with '#if 0'.

Files:
11 edited

Legend:

Unmodified
Added
Removed
  • aclocal.m4

    r06fa582 r2d7d605  
    462462#include <sys/sem.h>
    463463int main () {
    464 #if !defined(sun)
    465   union semun arg;
     464#if !defined(sun) 
     465  union semun arg ;
    466466#else
    467467  union semun {
  • c/src/lib/libbsp/i386/pc386/console/console.c

    r06fa582 r2d7d605  
    4141#include <termios.h>
    4242#include <pc386uart.h>
     43#include <libcpu/cpuModel.h>
    4344
    4445int PC386ConsolePort = PC386_CONSOLE_PORT_CONSOLE;
     
    6263
    6364extern rtems_boolean _IBMPC_scankey(char *);  /* defined in 'inch.c' */
    64 extern BSP_polling_getchar_function_type BSP_wait_polled_input();
    65 extern void _IBMPC_initVideo();
     65extern char BSP_wait_polled_input(void);
     66extern void _IBMPC_initVideo(void);
    6667
    6768void console_reserve_resources(rtems_configuration_table *conf)
     
    170171
    171172      /* Install keyboard interrupt handler */
    172   status = pc386_install_rtems_irq_handler(&console_isr_data);
     173      status = pc386_install_rtems_irq_handler(&console_isr_data);
    173174 
    174   if (!status)
     175      if (!status)
    175176        {
    176177          printk("Error installing keyboard interrupt handler!\n");
     
    482483 */
    483484
    484 BSP_output_char_function_type BSP_output_char = (BSP_output_char_function_type) _IBMPC_outch;
    485 BSP_polling_getchar_function_type       BSP_poll_char = BSP_wait_polled_input;
     485BSP_output_char_function_type BSP_output_char =
     486                       (BSP_output_char_function_type) _IBMPC_outch;
     487
     488BSP_polling_getchar_function_type BSP_poll_char = BSP_wait_polled_input;
     489
    486490void BSP_emergency_output_init()
    487491{
  • c/src/lib/libbsp/i386/pc386/network/network.c

    r06fa582 r2d7d605  
    512512    }
    513513    else if (strcmp ("bpar", argv[argIndex]) == 0) {
    514       sscanf(argv[++argIndex], "%x", (unsigned) &(dp->bpar));
     514      sscanf(argv[++argIndex], "%x", (unsigned *) &(dp->bpar));
    515515      dp->base = (unsigned char *)(dp->bpar);
    516516    }
  • c/src/lib/libbsp/i386/pc386/start/Makefile.in

    r06fa582 r2d7d605  
    6565
    6666${ARCH}/start16.bin: ${ARCH}/start16.o
    67         - $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \
     67        $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \
    6868          --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o
    69         - $(OBJCOPY) -O binary $(basename $@).obj $@
    70         cp $(basename $@).o $(basename $@).bin
     69        $(OBJCOPY) -O binary $(basename $@).obj $@
  • c/src/lib/libbsp/i386/pc386/start/start.s

    r06fa582 r2d7d605  
    107107        addl    $4, esp
    108108
    109         call    debugPollingGetChar
     109        /* call debugPollingGetChar */
    110110       
    111111#endif 
  • c/src/lib/libbsp/i386/pc386/timer/timer.c

    r06fa582 r2d7d605  
    5656| External Prototypes
    5757+--------------------------------------------------------------------------*/
    58 extern void timerisr();
     58extern void timerisr(void);
    5959       /* timer (int 08h) Interrupt Service Routine (defined in 'timerisr.s') */
    60 extern int clockIsOn(const rtems_irq_connect_data*);
    6160
    6261/*-------------------------------------------------------------------------+
     
    156155|          Returns: Nothing.
    157156+--------------------------------------------------------------------------*/
    158 void
     157static void
    159158timerOff(const rtems_raw_irq_connect_data* used)
    160159{
     
    170169
    171170
    172 void timerOn(const rtems_raw_irq_connect_data* used)
     171static void
     172timerOn(const rtems_raw_irq_connect_data* used)
    173173{
    174174     /* load timer for US_PER_ISR microsecond period */
     
    182182}
    183183
     184static int
     185timerIsOn(const rtems_raw_irq_connect_data *used)
     186{
     187     return pc386_irq_enabled_at_i8259s(used->idtIndex - PC386_IRQ_VECTOR_BASE);}
     188
    184189static rtems_raw_irq_connect_data timer_raw_irq_data = {
    185190  PC_386_PERIODIC_TIMER + PC386_IRQ_VECTOR_BASE,
     
    187192  timerOn,
    188193  timerOff,
    189   clockIsOn
     194  timerIsOn
    190195};
    191196
  • c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in

    r06fa582 r2d7d605  
    99PROJECT_ROOT = @PROJECT_ROOT@
    1010
    11 BSP_PIECES=startup clock console timer pc386dev network
     11# We only build the Network library if HAS_KA9Q was defined
     12NETWORK_yes_V = network
     13NETWORK = $(NETWORK_$(HAS_KA9Q)_V)
     14
     15BSP_PIECES=startup clock console timer pc386dev $(NETWORK)
    1216GENERIC_PIECES=
    1317
     
    5357
    5458
     59
  • c/src/lib/libbsp/i386/shared/io/bspIo.h

    r06fa582 r2d7d605  
    2323 */
    2424typedef void    (*BSP_output_char_function_type)        (char c);
    25 typedef char    (*BSP_polling_getchar_function_type)    (char c);
     25typedef char    (*BSP_polling_getchar_function_type)    (void);
    2626
    2727extern  BSP_output_char_function_type           BSP_output_char;
    2828extern  BSP_polling_getchar_function_type       BSP_poll_char;
    29 extern  void BSP_emergency_output_init();
     29extern  void BSP_emergency_output_init(void);
    3030/*
    3131 * All the function declared as extern after this comment
  • c/src/lib/libbsp/i386/shared/irq/irq_asm.s

    r06fa582 r2d7d605  
    2222
    2323/*PAGE
    24  *  void _new_ISR_Displatch()
     24 *  void _New_ISR_Displatch()
    2525 *
    2626 *  Entry point from the outermost interrupt service routine exit.
     
    2828 */
    2929
    30         PUBLIC (_new_ISR_Displatch)
     30        PUBLIC (_New_ISR_Displatch)
    3131SYM (_New_ISR_Displatch):
    3232
  • configure

    r06fa582 r2d7d605  
    27442744#include <sys/sem.h>
    27452745int main () {
    2746 #if !defined(sun)
    2747   union semun arg;
     2746#if !defined(sun) 
     2747  union semun arg ;
    27482748#else
    27492749  union semun {
     
    27632763
    27642764EOF
    2765 if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     2765if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    27662766then
    27672767  rtems_cv_sysv_sem="yes"
     
    27862786
    27872787echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6
    2788 echo "configure:2781: checking whether $RTEMS_HOST supports System V shared memory" >&5
     2788echo "configure:2789: checking whether $RTEMS_HOST supports System V shared memory" >&5
    27892789if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then
    27902790  echo $ac_n "(cached) $ac_c" 1>&6
     
    27952795else
    27962796  cat > conftest.$ac_ext <<EOF
    2797 #line 2790 "configure"
     2797#line 2798 "configure"
    27982798#include "confdefs.h"
    27992799
     
    28112811
    28122812EOF
    2813 if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     2813if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    28142814then
    28152815  rtems_cv_sysv_shm="yes"
     
    28342834
    28352835echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6
    2836 echo "configure:2829: checking whether $RTEMS_HOST supports System V messages" >&5
     2836echo "configure:2837: checking whether $RTEMS_HOST supports System V messages" >&5
    28372837if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then
    28382838  echo $ac_n "(cached) $ac_c" 1>&6
     
    28432843else
    28442844  cat > conftest.$ac_ext <<EOF
    2845 #line 2838 "configure"
     2845#line 2846 "configure"
    28462846#include "confdefs.h"
    28472847
     
    28592859
    28602860EOF
    2861 if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
     2861if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
    28622862then
    28632863  rtems_cv_sysv_msg="yes"
     
    28842884
    28852885echo $ac_n "checking for Makefile.in in c/src/exec/score/tools/$target_cpu""... $ac_c" 1>&6
    2886 echo "configure:2879: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5
     2886echo "configure:2887: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5
    28872887if test -d $srcdir/c/src/exec/score/tools/$target_cpu; then
    28882888  rtems_av_save_dir=`pwd`;
     
    28992899
    29002900echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6
    2901 echo "configure:2894: checking for Makefile.in in c/src/exec/rtems" >&5
     2901echo "configure:2902: checking for Makefile.in in c/src/exec/rtems" >&5
    29022902if test -d $srcdir/c/src/exec/rtems; then
    29032903  rtems_av_save_dir=`pwd`;
     
    29142914
    29152915echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6
    2916 echo "configure:2909: checking for Makefile.in in c/src/exec/sapi" >&5
     2916echo "configure:2917: checking for Makefile.in in c/src/exec/sapi" >&5
    29172917if test -d $srcdir/c/src/exec/sapi; then
    29182918  rtems_av_save_dir=`pwd`;
     
    29312931 
    29322932echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6
    2933 echo "configure:2926: checking for Makefile.in in c/src/exec/posix" >&5
     2933echo "configure:2934: checking for Makefile.in in c/src/exec/posix" >&5
    29342934if test -d $srcdir/c/src/exec/posix; then
    29352935  rtems_av_save_dir=`pwd`;
     
    29532953  if test -z "$rtems_bsp"; then
    29542954    echo $ac_n "checking for bsps""... $ac_c" 1>&6
    2955 echo "configure:2948: checking for bsps" >&5
     2955echo "configure:2956: checking for bsps" >&5
    29562956    files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
    29572957    for file in $files; do
     
    30183018       
    30193019echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir""... $ac_c" 1>&6
    3020 echo "configure:3013: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
     3020echo "configure:3021: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
    30213021if test -d $srcdir/c/src/lib/libbsp/$bspcpudir$bspdir; then
    30223022  rtems_av_save_dir=`pwd`;
     
    30333033       
    30343034echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared""... $ac_c" 1>&6
    3035 echo "configure:3028: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
     3035echo "configure:3036: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
    30363036if test -d $srcdir/c/src/lib/libbsp/${bspcpudir}shared; then
    30373037  rtems_av_save_dir=`pwd`;
     
    30563056
    30573057echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6
    3058 echo "configure:3051: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
     3058echo "configure:3059: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
    30593059if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then
    30603060  rtems_av_save_dir=`pwd`;
     
    30733073 
    30743074echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6
    3075 echo "configure:3068: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
     3075echo "configure:3076: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
    30763076if test -d $srcdir/c/src/lib/start/$target_cpu; then
    30773077  rtems_av_save_dir=`pwd`;
     
    31153115# If the tests are enabled, then find all the test suite Makefiles
    31163116echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6
    3117 echo "configure:3110: checking if the test suites are enabled? " >&5
     3117echo "configure:3118: checking if the test suites are enabled? " >&5
    31183118tests_enabled=yes
    31193119# Check whether --enable-tests or --disable-tests was given.
     
    31343134
    31353135echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
    3136 echo "configure:3129: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
     3136echo "configure:3137: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
    31373137if test -d $srcdir/c/src/tests/tools/$target_cpu; then
    31383138  rtems_av_save_dir=`pwd`;
     
    31513151   
    31523152echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
    3153 echo "configure:3146: checking for Makefile.in in c/src/tests/libtests" >&5
     3153echo "configure:3154: checking for Makefile.in in c/src/tests/libtests" >&5
    31543154if test -d $srcdir/c/src/tests/libtests; then
    31553155  rtems_av_save_dir=`pwd`;
     
    31663166   
    31673167echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
    3168 echo "configure:3161: checking for Makefile.in in c/src/tests/sptests" >&5
     3168echo "configure:3169: checking for Makefile.in in c/src/tests/sptests" >&5
    31693169if test -d $srcdir/c/src/tests/sptests; then
    31703170  rtems_av_save_dir=`pwd`;
     
    31813181   
    31823182echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
    3183 echo "configure:3176: checking for Makefile.in in c/src/tests/tmtests" >&5
     3183echo "configure:3184: checking for Makefile.in in c/src/tests/tmtests" >&5
    31843184if test -d $srcdir/c/src/tests/tmtests; then
    31853185  rtems_av_save_dir=`pwd`;
     
    31963196   
    31973197echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
    3198 echo "configure:3191: checking for Makefile.in in c/src/tests/mptests" >&5
     3198echo "configure:3199: checking for Makefile.in in c/src/tests/mptests" >&5
    31993199if test -d $srcdir/c/src/tests/mptests; then
    32003200  rtems_av_save_dir=`pwd`;
     
    32123212     
    32133213echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
    3214 echo "configure:3207: checking for Makefile.in in c/src/tests/psxtests" >&5
     3214echo "configure:3215: checking for Makefile.in in c/src/tests/psxtests" >&5
    32153215if test -d $srcdir/c/src/tests/psxtests; then
    32163216  rtems_av_save_dir=`pwd`;
     
    32303230# If the HWAPI is enabled, the find the HWAPI Makefiles
    32313231echo $ac_n "checking if the HWAPI is enabled? ""... $ac_c" 1>&6
    3232 echo "configure:3225: checking if the HWAPI is enabled? " >&5
     3232echo "configure:3233: checking if the HWAPI is enabled? " >&5
    32333233# Check whether --enable-hwapi or --disable-hwapi was given.
    32343234if test "${enable_hwapi+set}" = set; then
     
    32413241           
    32423242echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6
    3243 echo "configure:3236: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
     3243echo "configure:3244: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
    32443244if test -d $srcdir/c/src/lib/libhwapi/analog; then
    32453245  rtems_av_save_dir=`pwd`;
     
    32563256           
    32573257echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6
    3258 echo "configure:3251: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
     3258echo "configure:3259: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
    32593259if test -d $srcdir/c/src/lib/libhwapi/discrete; then
    32603260  rtems_av_save_dir=`pwd`;
     
    32713271           
    32723272echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6
    3273 echo "configure:3266: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
     3273echo "configure:3274: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
    32743274if test -d $srcdir/c/src/lib/libhwapi/drivers; then
    32753275  rtems_av_save_dir=`pwd`;
     
    32863286           
    32873287echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6
    3288 echo "configure:3281: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
     3288echo "configure:3289: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
    32893289if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then
    32903290  rtems_av_save_dir=`pwd`;
     
    33013301           
    33023302echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6
    3303 echo "configure:3296: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
     3303echo "configure:3304: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
    33043304if test -d $srcdir/c/src/lib/libhwapi/serial; then
    33053305  rtems_av_save_dir=`pwd`;
     
    33163316           
    33173317echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6
    3318 echo "configure:3311: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
     3318echo "configure:3319: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
    33193319if test -d $srcdir/c/src/lib/libhwapi/support; then
    33203320  rtems_av_save_dir=`pwd`;
     
    33313331           
    33323332echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6
    3333 echo "configure:3326: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
     3333echo "configure:3334: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
    33343334if test -d $srcdir/c/src/lib/libhwapi/wrapup; then
    33353335  rtems_av_save_dir=`pwd`;
     
    33763376
    33773377echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6
    3378 echo "configure:3371: checking for Makefile.in in c/build-tools" >&5
     3378echo "configure:3379: checking for Makefile.in in c/build-tools" >&5
    33793379if test -d $srcdir/c/build-tools; then
    33803380  rtems_av_save_dir=`pwd`;
     
    33913391
    33923392echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6
    3393 echo "configure:3386: checking for Makefile.in in make" >&5
     3393echo "configure:3394: checking for Makefile.in in make" >&5
    33943394if test -d $srcdir/make; then
    33953395  rtems_av_save_dir=`pwd`;
     
    34063406
    34073407echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
    3408 echo "configure:3401: checking for Makefile.in in c/src/lib/libmisc" >&5
     3408echo "configure:3409: checking for Makefile.in in c/src/lib/libmisc" >&5
    34093409if test -d $srcdir/c/src/lib/libmisc; then
    34103410  rtems_av_save_dir=`pwd`;
     
    34213421
    34223422echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
    3423 echo "configure:3416: checking for Makefile.in in c/src/tests/samples" >&5
     3423echo "configure:3424: checking for Makefile.in in c/src/tests/samples" >&5
    34243424if test -d $srcdir/c/src/tests/samples; then
    34253425  rtems_av_save_dir=`pwd`;
  • make/custom/pc386.cfg

    r06fa582 r2d7d605  
    5959
    6060START16FILE=$(PROJECT_RELEASE)/lib/start16.bin
    61 #START16ADDR=0x00097C00
    62 #HEADERADDR=0x00097E00
    63 # this may not be right but it accounts for a change in the .s file size.
    64 START16ADDR=0x00097A00
     61START16ADDR=0x00097C00
    6562HEADERADDR=0x00097E00
    6663
     
    109106
    110107# Miscellaneous additions go here
    111 
    112 
    113 
Note: See TracChangeset for help on using the changeset viewer.