coreboot April 2010

coreboot@coreboot.org

64 participants
402 discussions

build service results for r5374
by coreboot information 08 Apr '10

08 Apr '10

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 5374 to the coreboot repository. This caused the following changes: Change Log: Remove duplicate registers in digitallogic/adl855pc's device tree Create directories before trying to copy files into them Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Build Log: Compilation of asi:mb_5blgp has been fixed Compilation of digitallogic:adl855pc has been fixed Compilation of kontron:kt690 has been fixed Compilation of tyan:s2850 has been fixed Compilation of tyan:s2881 has been fixed If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r5374 - in trunk: src/mainboard/digitallogic/adl855pc util/sconfig
by repository service 08 Apr '10

08 Apr '10

Author: oxygene Date: Thu Apr 8 14:00:35 2010 New Revision: 5374 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5374 Log: Remove duplicate registers in digitallogic/adl855pc's device tree Create directories before trying to copy files into them Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb trunk/util/sconfig/Makefile.inc Modified: trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Thu Apr 8 13:37:43 2010 (r5373) +++ trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Thu Apr 8 14:00:35 2010 (r5374) @@ -13,8 +13,6 @@ # pci 12.0 on end register "enable_usb" = "0" register "enable_native_ide" = "0" - register "enable_usb" = "0" - register "enable_native_ide" = "0" chip superio/winbond/w83627hf # link 1 device pnp 2e.0 on # Floppy io 0x60 = 0x3f0 Modified: trunk/util/sconfig/Makefile.inc ============================================================================== --- trunk/util/sconfig/Makefile.inc Thu Apr 8 13:37:43 2010 (r5373) +++ trunk/util/sconfig/Makefile.inc Thu Apr 8 14:00:35 2010 (r5374) @@ -23,6 +23,7 @@ $(obj)/util/sconfig/lex.yy.o: $(obj)/util/sconfig/sconfig.tab.h $(obj)/util/sconfig/%: $(top)/util/sconfig/%_shipped + mkdir -p $(dir $@) cp $< $@ $(obj)/util/sconfig/sconfig: $(obj)/util/sconfig $(addprefix $(obj)/util/sconfig/,$(sconfigobj))

1 0

build service results for r5373
by coreboot information 08 Apr '10

08 Apr '10

Dear coreboot readers! This is the automatic build system of coreboot. The developer "oxygene" checked in revision 5373 to the coreboot repository. This caused the following changes: Change Log: Replace sconfig with a C implementation. (smaller, faster, standard parser generator, no more python) Provide precompiled parser, so bison and flex are optional dependencies. Adapt Makefile and abuild (which uses some sconfig file as a magic path) to match. Drop python as dependency from README, and add bison and flex as optional dependencies Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Build Log: Compilation of asi:mb_5blgp has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5373&device=mb_5blgp&vendo… Compilation of digitallogic:adl855pc has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5373&device=adl855pc&vendo… Compilation of kontron:kt690 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5373&device=kt690&vendor=k… Compilation of tyan:s2850 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5373&device=s2850&vendor=t… Compilation of tyan:s2881 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5373&device=s2881&vendor=t… If something broke during this checkin please be a pain in oxygene's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r5373 - in trunk: . util/abuild util/sconfig
by repository service 08 Apr '10

08 Apr '10

Author: oxygene Date: Thu Apr 8 13:37:43 2010 New Revision: 5373 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5373 Log: Replace sconfig with a C implementation. (smaller, faster, standard parser generator, no more python) Provide precompiled parser, so bison and flex are optional dependencies. Adapt Makefile and abuild (which uses some sconfig file as a magic path) to match. Drop python as dependency from README, and add bison and flex as optional dependencies Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Added: trunk/util/sconfig/Makefile.inc trunk/util/sconfig/lex.yy.c_shipped trunk/util/sconfig/sconfig.l (contents, props changed) trunk/util/sconfig/sconfig.tab.c_shipped trunk/util/sconfig/sconfig.tab.h_shipped trunk/util/sconfig/sconfig.y (contents, props changed) Deleted: trunk/util/sconfig/LICENSE trunk/util/sconfig/Makefile trunk/util/sconfig/NOTES trunk/util/sconfig/config.g trunk/util/sconfig/parsedesc.g trunk/util/sconfig/test.config trunk/util/sconfig/yapps2.py trunk/util/sconfig/yapps2.tex trunk/util/sconfig/yappsrt.py Modified: trunk/Makefile trunk/README trunk/util/abuild/abuild Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Apr 7 17:40:26 2010 (r5372) +++ trunk/Makefile Thu Apr 8 13:37:43 2010 (r5373) @@ -37,9 +37,6 @@ export srck := $(top)/util/kconfig export obj ?= build export objk := $(obj)/util/kconfig -export sconfig := $(top)/util/sconfig -export yapps2_py := $(sconfig)/yapps2.py -export config_g := $(sconfig)/config.g export KERNELVERSION := 4.0 @@ -109,7 +106,7 @@ TARGETS-y := BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers -BUILD-y += util/cbfstool +BUILD-y += util/cbfstool util/sconfig BUILD-$(CONFIG_ARCH_X86) += src/pc80 ifneq ($(CONFIG_LOCALVERSION),"") @@ -150,16 +147,11 @@ CBFSTOOL:=$(obj)/util/cbfstool/cbfstool -$(obj)/mainboard/$(MAINBOARDDIR)/config.py: $(yapps2_py) $(config_g) - mkdir -p $(obj)/mainboard/$(MAINBOARDDIR) - python $(yapps2_py) $(config_g) $(obj)/mainboard/$(MAINBOARDDIR)/config.py - - # needed objects that every mainboard uses # Creation of these is architecture and mainboard independent -$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb $(obj)/mainboard/$(MAINBOARDDIR)/config.py +$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb $(obj)/util/sconfig/sconfig mkdir -p $(obj)/mainboard/$(MAINBOARDDIR) - (PYTHONPATH=$(top)/util/sconfig python $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(MAINBOARDDIR) $(top) $(obj)/mainboard/$(MAINBOARDDIR)) + $(obj)/util/sconfig/sconfig $(MAINBOARDDIR) $(obj)/mainboard/$(MAINBOARDDIR) objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o initobjs:= @@ -334,7 +326,6 @@ rm -f $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.* $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.* rm -f $(obj)/cpu/x86/smm/smm_bin.c $(obj)/cpu/x86/smm/smm.* $(obj)/cpu/x86/smm/smm rmdir -p $(alldirs) 2>/dev/null >/dev/null || true - $(MAKE) -C util/sconfig clean clean: clean-for-update rm -f $(obj)/coreboot* .ccwrap Modified: trunk/README ============================================================================== --- trunk/README Wed Apr 7 17:40:26 2010 (r5372) +++ trunk/README Thu Apr 8 13:37:43 2010 (r5373) @@ -34,7 +34,6 @@ * gcc / g++ * make - * python Optional: @@ -42,6 +41,7 @@ * iasl (for targets with ACPI support) * gdb (for better debugging facilities on some targets) * ncurses (for 'make menuconfig') + * flex and bison (for regenerating parsers) Building coreboot Modified: trunk/util/abuild/abuild ============================================================================== --- trunk/util/abuild/abuild Wed Apr 7 17:40:26 2010 (r5372) +++ trunk/util/abuild/abuild Thu Apr 8 13:37:43 2010 (r5373) @@ -558,8 +558,8 @@ buildall=false verbose=false -test -f util/sconfig/config.g && ROOT=$( pwd ) -test -f ../util/sconfig/config.g && ROOT=$( cd ..; pwd ) +test -f util/sconfig/sconfig.l && ROOT=$( pwd ) +test -f ../util/sconfig/sconfig.l && ROOT=$( cd ..; pwd ) test "$ROOT" = "" && ROOT=$( cd ../..; pwd ) # parse parameters.. try to find out whether we're running GNU getopt Added: trunk/util/sconfig/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/sconfig/Makefile.inc Thu Apr 8 13:37:43 2010 (r5373) @@ -0,0 +1,30 @@ +sconfigobj := +sconfigobj += lex.yy.o +sconfigobj += sconfig.tab.o + +$(obj)/util/sconfig: + mkdir -p $@ + +$(obj)/util/sconfig/%.o: $(obj)/util/sconfig/%.c + printf " HOSTCC $(subst $(obj)/,,$(@))\n" + $(HOSTCC) $(SCONFIGFLAGS) $(HOSTCFLAGS) -c -o $@ $< + +ifdef SCONFIG_GENPARSER +$(top)/util/sconfig/lex.yy.c_shipped: $(top)/util/sconfig/sconfig.l + flex -o $@ $< + +# the .c rule also creates .h +$(top)/util/sconfig/sconfig.tab.h_shipped: $(top)/util/sconfig/sconfig.tab.c_shipped +$(top)/util/sconfig/sconfig.tab.c_shipped: $(top)/util/sconfig/sconfig.y + bison --defines=$(top)/util/sconfig/sconfig.tab.h_shipped -o $@ $< + +endif + +$(obj)/util/sconfig/lex.yy.o: $(obj)/util/sconfig/sconfig.tab.h + +$(obj)/util/sconfig/%: $(top)/util/sconfig/%_shipped + cp $< $@ + +$(obj)/util/sconfig/sconfig: $(obj)/util/sconfig $(addprefix $(obj)/util/sconfig/,$(sconfigobj)) + printf " HOSTCXX $(subst $(obj)/,,$(@)) (link)\n" + $(HOSTCXX) $(SCONFIGFLAGS) -o $@ $(addprefix $(obj)/util/sconfig/,$(sconfigobj)) Added: trunk/util/sconfig/lex.yy.c_shipped ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/sconfig/lex.yy.c_shipped Thu Apr 8 13:37:43 2010 (r5373) @@ -0,0 +1,1932 @@ +#line 2 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped" + +#line 4 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include <inttypes.h> +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN (yy_start) = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START (((yy_start) - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE yyrestart(yyin ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +extern int yyleng; + +extern FILE *yyin, *yyout; + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ + YY_RESTORE_YY_MORE_OFFSET \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, (yytext_ptr) ) + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + * + * Returns the top of the stack, or NULL. + */ +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) + +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] + +/* yy_hold_char holds the character lost when yytext is formed. */ +static char yy_hold_char; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; + +/* Points to current character in buffer. */ +static char *yy_c_buf_p = (char *) 0; +static int yy_init = 0; /* whether we need to initialize */ +static int yy_start = 0; /* start state number */ + +/* Flag which is used to allow yywrap()'s to do buffer switches + * instead of setting up a fresh yyin. A bit of a hack ... + */ +static int yy_did_buffer_switch_on_eof; + +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +static void yyensure_buffer_stack (void ); +static void yy_load_buffer_state (void ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); + +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); + +#define yy_new_buffer yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ + +typedef unsigned char YY_CHAR; + +FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + +typedef int yy_state_type; + +extern int yylineno; + +int yylineno = 1; + +extern char *yytext; +#define yytext_ptr yytext + +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up yytext. + */ +#define YY_DO_BEFORE_ACTION \ + (yytext_ptr) = yy_bp; \ + yyleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ + *yy_cp = '\0'; \ + (yy_c_buf_p) = yy_cp; + +#define YY_NUM_RULES 25 +#define YY_END_OF_BUFFER 26 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[86] = + { 0, + 0, 0, 26, 24, 1, 3, 24, 24, 24, 21, + 21, 19, 22, 22, 22, 22, 22, 24, 24, 24, + 24, 24, 1, 3, 24, 0, 24, 0, 2, 21, + 22, 24, 24, 24, 22, 24, 24, 24, 17, 24, + 24, 7, 24, 24, 24, 23, 23, 20, 24, 24, + 24, 16, 18, 11, 15, 8, 9, 10, 24, 12, + 4, 24, 24, 24, 24, 24, 24, 24, 24, 5, + 24, 24, 24, 24, 24, 24, 24, 6, 24, 24, + 24, 14, 24, 13, 0 + } ; + +static yyconst flex_int32_t yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 5, 6, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 7, 1, 8, 7, 9, + 7, 7, 7, 7, 7, 7, 7, 1, 1, 1, + 10, 1, 1, 1, 11, 11, 11, 11, 11, 11, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 12, 1, 13, 11, 14, 15, + + 16, 17, 18, 19, 20, 1, 1, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 1, 32, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +static yyconst flex_int32_t yy_meta[33] = + { 0, + 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1 + } ; + +static yyconst flex_int16_t yy_base[91] = + { 0, + 0, 0, 146, 0, 143, 147, 141, 31, 35, 32, + 111, 0, 43, 46, 49, 65, 52, 53, 46, 21, + 126, 0, 139, 147, 62, 135, 76, 136, 147, 0, + 75, 86, 118, 117, 78, 110, 120, 120, 0, 107, + 115, 0, 111, 105, 111, 0, 147, 0, 114, 102, + 106, 0, 0, 0, 0, 0, 113, 0, 104, 111, + 0, 108, 106, 92, 105, 102, 84, 78, 85, 0, + 83, 88, 68, 83, 64, 62, 69, 0, 59, 53, + 54, 0, 39, 0, 147, 41, 109, 111, 113, 115 + } ; + +static yyconst flex_int16_t yy_def[91] = + { 0, + 85, 1, 85, 86, 85, 85, 86, 87, 88, 86, + 10, 86, 10, 10, 10, 10, 10, 86, 86, 86, + 86, 86, 85, 85, 87, 89, 88, 90, 85, 10, + 10, 10, 86, 86, 10, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 85, 32, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 0, 85, 85, 85, 85, 85 + } ; + +static yyconst flex_int16_t yy_nxt[180] = + { 0, + 4, 5, 6, 7, 8, 9, 10, 11, 10, 12, + 13, 4, 14, 15, 16, 17, 13, 4, 4, 18, + 4, 4, 4, 19, 20, 4, 21, 4, 4, 4, + 4, 4, 26, 26, 43, 22, 28, 29, 30, 30, + 30, 22, 31, 44, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 38, 41, 26, 26, 84, 46, 34, 42, 83, + 33, 31, 31, 31, 37, 82, 39, 28, 29, 40, + 35, 31, 31, 31, 31, 31, 31, 81, 80, 79, + 78, 36, 48, 48, 48, 77, 48, 76, 48, 48, + + 48, 48, 48, 75, 74, 73, 72, 71, 51, 25, + 25, 27, 27, 26, 26, 28, 28, 70, 69, 68, + 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, + 57, 56, 55, 54, 53, 52, 50, 49, 29, 47, + 23, 45, 32, 24, 23, 85, 3, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85 + } ; + +static yyconst flex_int16_t yy_chk[180] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 8, 8, 20, 8, 9, 9, 10, 10, + 10, 86, 10, 20, 10, 10, 10, 10, 10, 13, + 13, 13, 14, 14, 14, 15, 15, 15, 17, 17, + 17, 18, 19, 25, 25, 83, 25, 15, 19, 81, + 14, 16, 16, 16, 17, 80, 18, 27, 27, 18, + 16, 31, 31, 31, 35, 35, 35, 79, 77, 76, + 75, 16, 32, 32, 32, 74, 32, 73, 32, 32, + + 32, 32, 32, 72, 71, 69, 68, 67, 35, 87, + 87, 88, 88, 89, 89, 90, 90, 66, 65, 64, + 63, 62, 60, 59, 57, 51, 50, 49, 45, 44, + 43, 41, 40, 38, 37, 36, 34, 33, 28, 26, + 23, 21, 11, 7, 5, 3, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85 + } ; + +static yy_state_type yy_last_accepting_state; +static char *yy_last_accepting_cpos; + +extern int yy_flex_debug; +int yy_flex_debug = 0; + +/* The intent behind this definition is that it'll catch + * any uses of REJECT which flex missed. + */ +#define REJECT reject_used_but_not_detected +#define yymore() yymore_used_but_not_detected +#define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET +char *yytext; +#line 1 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +#line 2 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +/* + * sconfig, coreboot device tree compiler + * + * Copyright (C) 2010 coresystems GmbH + * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include "sconfig.tab.h" + +int linenum = 0; +#line 537 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped" + +#define INITIAL 0 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include <unistd.h> +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +static int yy_init_globals (void ); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (void ); + +int yyget_debug (void ); + +void yyset_debug (int debug_flag ); + +YY_EXTRA_TYPE yyget_extra (void ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ); + +FILE *yyget_in (void ); + +void yyset_in (FILE * in_str ); + +FILE *yyget_out (void ); + +void yyset_out (FILE * out_str ); + +int yyget_leng (void ); + +char *yyget_text (void ); + +int yyget_lineno (void ); + +void yyset_lineno (int line_number ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap (void ); +#else +extern int yywrap (void ); +#endif +#endif + + static void yyunput (int c,char *buf_ptr ); + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ); +#endif + +#ifndef YY_NO_INPUT + +#ifdef __cplusplus +static int yyinput (void ); +#else +static int input (void ); +#endif + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Copy whatever the last rule matched to the standard output. */ +#ifndef ECHO +/* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#endif + +/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, + * is returned in "result". + */ +#ifndef YY_INPUT +#define YY_INPUT(buf,result,max_size) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ + int n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + +#endif + +/* No semi-colon after return; correct usage is to write "yyterminate();" - + * we don't want an extra ';' after the "return" because that will cause + * some compilers to complain about unreachable statements. + */ +#ifndef yyterminate +#define yyterminate() return YY_NULL +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Report a fatal error. */ +#ifndef YY_FATAL_ERROR +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) +#endif + +/* end tables serialization structures and prototypes */ + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ + +/* Code executed at the beginning of each rule, after yytext and yyleng + * have been set up. + */ +#ifndef YY_USER_ACTION +#define YY_USER_ACTION +#endif + +/* Code executed at the end of each rule. */ +#ifndef YY_BREAK +#define YY_BREAK break; +#endif + +#define YY_RULE_SETUP \ + YY_USER_ACTION + +/** The main scanner function which does all the work. + */ +YY_DECL +{ + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; + +#line 27 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" + +#line 721 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped" + + if ( !(yy_init) ) + { + (yy_init) = 1; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ + + if ( ! yyin ) + yyin = stdin; + + if ( ! yyout ) + yyout = stdout; + + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); + } + + yy_load_buffer_state( ); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yy_cp = (yy_c_buf_p); + + /* Support of yytext. */ + *yy_cp = (yy_hold_char); + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = (yy_start); +yy_match: + do + { + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 86 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } + while ( yy_base[yy_current_state] != 147 ); + +yy_find_action: + yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + yy_act = yy_accept[yy_current_state]; + } + + YY_DO_BEFORE_ACTION; + +do_action: /* This label is used only to access EOF actions. */ + + switch ( yy_act ) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + goto yy_find_action; + +case 1: +YY_RULE_SETUP +#line 28 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{} + YY_BREAK +case 2: +/* rule 2 can match eol */ +YY_RULE_SETUP +#line 29 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{linenum++;} + YY_BREAK +case 3: +/* rule 3 can match eol */ +YY_RULE_SETUP +#line 30 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{linenum++;} + YY_BREAK +case 4: +YY_RULE_SETUP +#line 31 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{return(CHIP);} + YY_BREAK +case 5: +YY_RULE_SETUP +#line 32 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{return(DEVICE);} + YY_BREAK +case 6: +YY_RULE_SETUP +#line 33 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{return(REGISTER);} + YY_BREAK +case 7: +YY_RULE_SETUP +#line 34 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=1; return(BOOL);} + YY_BREAK +case 8: +YY_RULE_SETUP +#line 35 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=0; return(BOOL);} + YY_BREAK +case 9: +YY_RULE_SETUP +#line 36 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=PCI; return(BUS);} + YY_BREAK +case 10: +YY_RULE_SETUP +#line 37 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=PNP; return(BUS);} + YY_BREAK +case 11: +YY_RULE_SETUP +#line 38 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=I2C; return(BUS);} + YY_BREAK +case 12: +YY_RULE_SETUP +#line 39 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=APIC; return(BUS);} + YY_BREAK +case 13: +YY_RULE_SETUP +#line 40 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=APIC_CLUSTER; return(BUS);} + YY_BREAK +case 14: +YY_RULE_SETUP +#line 41 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=PCI_DOMAIN; return(BUS);} + YY_BREAK +case 15: +YY_RULE_SETUP +#line 42 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=IRQ; return(RESOURCE);} + YY_BREAK +case 16: +YY_RULE_SETUP +#line 43 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=DRQ; return(RESOURCE);} + YY_BREAK +case 17: +YY_RULE_SETUP +#line 44 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.number=IO; return(RESOURCE);} + YY_BREAK +case 18: +YY_RULE_SETUP +#line 45 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{return(END);} + YY_BREAK +case 19: +YY_RULE_SETUP +#line 46 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{return(EQUALS);} + YY_BREAK +case 20: +YY_RULE_SETUP +#line 47 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);} + YY_BREAK +case 21: +YY_RULE_SETUP +#line 48 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);} + YY_BREAK +case 22: +YY_RULE_SETUP +#line 49 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);} + YY_BREAK +case 23: +/* rule 23 can match eol */ +YY_RULE_SETUP +#line 50 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);} + YY_BREAK +case 24: +YY_RULE_SETUP +#line 51 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);} + YY_BREAK +case 25: +YY_RULE_SETUP +#line 52 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" +ECHO; + YY_BREAK +#line 932 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped" +case YY_STATE_EOF(INITIAL): + yyterminate(); + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; + + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = (yy_hold_char); + YY_RESTORE_YY_MORE_OFFSET + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * yylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( ); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state ); + + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + + if ( yy_next_state ) + { + /* Consume the NUL. */ + yy_cp = ++(yy_c_buf_p); + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = (yy_c_buf_p); + goto yy_find_action; + } + } + + else switch ( yy_get_next_buffer( ) ) + { + case EOB_ACT_END_OF_FILE: + { + (yy_did_buffer_switch_on_eof) = 0; + + if ( yywrap( ) ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } + + else + { + if ( ! (yy_did_buffer_switch_on_eof) ) + YY_NEW_FILE; + } + break; + } + + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( ); + + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; + + yy_current_state = yy_get_previous_state( ); + + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ +} /* end of yylex */ + +/* yy_get_next_buffer - try to read in a new buffer + * + * Returns a code representing an action: + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file + */ +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); + register int number_to_move, i; + int ret_val; + + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } + + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } + + /* Try to read more data. */ + + /* First move last chars to start of buffer. */ + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; + + else + { + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ + + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + + int yy_c_buf_p_offset = + (int) ((yy_c_buf_p) - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + int new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; + + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); + + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; + + } + + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; + + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), (size_t) num_to_read ); + + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + if ( (yy_n_chars) == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + yyrestart(yyin ); + } + + else + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } + } + + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; + + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + + return ret_val; +} + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + + static yy_state_type yy_get_previous_state (void) +{ + register yy_state_type yy_current_state; + register char *yy_cp; + + yy_current_state = (yy_start); + + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) + { + register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 86 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + } + + return yy_current_state; +} + +/* yy_try_NUL_trans - try to make a transition on the NUL character + * + * synopsis + * next_state = yy_try_NUL_trans( current_state ); + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ + register int yy_is_jam; + register char *yy_cp = (yy_c_buf_p); + + register YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 86 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_is_jam = (yy_current_state == 85); + + return yy_is_jam ? 0 : yy_current_state; +} + + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); + + /* undo effects of setting up yytext */ + *yy_cp = (yy_hold_char); + + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + register char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + *--dest = *--source; + + yy_cp += (int) (dest - source); + yy_bp += (int) (dest - source); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + YY_FATAL_ERROR( "flex scanner push-back overflow" ); + } + + *--yy_cp = (char) c; + + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} + +#ifndef YY_NO_INPUT +#ifdef __cplusplus + static int yyinput (void) +#else + static int input (void) +#endif + +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); + + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + /* This was really a NUL. */ + *(yy_c_buf_p) = '\0'; + + else + { /* need more input */ + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); + + switch ( yy_get_next_buffer( ) ) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart(yyin ); + + /*FALLTHROUGH*/ + + case EOB_ACT_END_OF_FILE: + { + if ( yywrap( ) ) + return EOF; + + if ( ! (yy_did_buffer_switch_on_eof) ) + YY_NEW_FILE; +#ifdef __cplusplus + return yyinput(); +#else + return input(); +#endif + } + + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = (yytext_ptr) + offset; + break; + } + } + } + + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); + + return c; +} +#endif /* ifndef YY_NO_INPUT */ + +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); + } + + yy_init_buffer(YY_CURRENT_BUFFER,input_file ); + yy_load_buffer_state( ); +} + +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) + return; + + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state( ); + + /* We don't actually know whether we did this switch during + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe + * to go ahead and always set it. + */ + (yy_did_buffer_switch_on_eof) = 1; +} + +static void yy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} + +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) +{ + YY_BUFFER_STATE b; + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_buf_size = size; + + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_is_our_buffer = 1; + + yy_init_buffer(b,file ); + + return b; +} + +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * + */ + void yy_delete_buffer (YY_BUFFER_STATE b ) +{ + + if ( ! b ) + return; + + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + + if ( b->yy_is_our_buffer ) + yyfree((void *) b->yy_ch_buf ); + + yyfree((void *) b ); +} + +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) + +{ + int oerrno = errno; + + yy_flush_buffer(b ); + + b->yy_input_file = file; + b->yy_fill_buffer = 1; + + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} + +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void yy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) + return; + + b->yy_n_chars = 0; + + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + + b->yy_buf_pos = &b->yy_ch_buf[0]; + + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; + + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + yyensure_buffer_stack(); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void yypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } + + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + yy_switch_to_buffer(b ); + + return b; +} + +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +{ + + return yy_scan_bytes(yystr,strlen(yystr) ); +} + +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +{ + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = _yybytes_len + 2; + buf = (char *) yyalloc(n ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; + + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + + b = yy_scan_buffer(buf,n ); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} + +/* Redefine yyless() so it works in section 3 code. */ + +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = (yy_hold_char); \ + (yy_c_buf_p) = yytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) + +/* Accessor methods (get/set functions) to struct members. */ + +/** Get the current line number. + * + */ +int yyget_lineno (void) +{ + + return yylineno; +} + +/** Get the input stream. + * + */ +FILE *yyget_in (void) +{ + return yyin; +} + +/** Get the output stream. + * + */ +FILE *yyget_out (void) +{ + return yyout; +} + +/** Get the length of the current token. + * + */ +int yyget_leng (void) +{ + return yyleng; +} + +/** Get the current token. + * + */ + +char *yyget_text (void) +{ + return yytext; +} + +/** Set the current line number. + * @param line_number + * + */ +void yyset_lineno (int line_number ) +{ + + yylineno = line_number; +} + +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * in_str ) +{ + yyin = in_str ; +} + +void yyset_out (FILE * out_str ) +{ + yyout = out_str ; +} + +int yyget_debug (void) +{ + return yy_flex_debug; +} + +void yyset_debug (int bdebug ) +{ + yy_flex_debug = bdebug ; +} + +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from yylex_destroy(), so don't allocate here. + */ + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; +#else + yyin = (FILE *) 0; + yyout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * yylex_init() + */ + return 0; +} + +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state(); + } + + /* Destroy the stack itself. */ + yyfree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * yylex() is called, initialization will occur. */ + yy_init_globals( ); + + return 0; +} + +/* + * Internal utility routines. + */ + +#ifndef yytext_ptr +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ + register int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; +} +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * s ) +{ + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; +} +#endif + +void *yyalloc (yy_size_t size ) +{ + return (void *) malloc( size ); +} + +void *yyrealloc (void * ptr, yy_size_t size ) +{ + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); +} + +void yyfree (void * ptr ) +{ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ +} + +#define YYTABLES_NAME "yytables" + +#line 52 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l" + + + Added: trunk/util/sconfig/sconfig.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/sconfig/sconfig.l Thu Apr 8 13:37:43 2010 (r5373) @@ -0,0 +1,52 @@ +%{ +/* + * sconfig, coreboot device tree compiler + * + * Copyright (C) 2010 coresystems GmbH + * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include "sconfig.tab.h" + +int linenum = 0; +%} +%option nodebug +%% +[ \t]+ {} +#.*\n {linenum++;} +\r?\n {linenum++;} +chip {return(CHIP);} +device {return(DEVICE);} +register {return(REGISTER);} +on {yylval.number=1; return(BOOL);} +off {yylval.number=0; return(BOOL);} +pci {yylval.number=PCI; return(BUS);} +pnp {yylval.number=PNP; return(BUS);} +i2c {yylval.number=I2C; return(BUS);} +apic {yylval.number=APIC; return(BUS);} +apic_cluster {yylval.number=APIC_CLUSTER; return(BUS);} +pci_domain {yylval.number=PCI_DOMAIN; return(BUS);} +irq {yylval.number=IRQ; return(RESOURCE);} +drq {yylval.number=DRQ; return(RESOURCE);} +io {yylval.number=IO; return(RESOURCE);} +end {return(END);} += {return(EQUALS);} +0x[0-9a-fA-F.]+ {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);} +[0-9.]+ {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);} +[0-9a-fA-F.]+ {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);} +\"[^\"]+\" {yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);} +[^ \n\t]+ {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);} +%% Added: trunk/util/sconfig/sconfig.tab.c_shipped ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/sconfig/sconfig.tab.c_shipped Thu Apr 8 13:37:43 2010 (r5373) @@ -0,0 +1,2088 @@ + +/* A Bison parser, made by GNU Bison 2.4.1. */ + +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.4.1" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 0 + +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + + + +/* Copy the first part of user declarations. */ + +/* Line 189 of yacc.c */ +#line 1 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + +/* + * sconfig, coreboot device tree compiler + * + * Copyright (C) 2010 coresystems GmbH + * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <errno.h> + +enum devtype { chip, device }; + +struct resource; +struct resource { + int type; + int index; + int base; + struct resource *next; +}; + +struct reg; +struct reg { + char *key; + char *value; + struct reg *next; +}; + +struct device; +struct device { + int id; + int enabled; + int used; + int multidev; + int link; + int rescnt; + int chiph_exists; + char *ops; + char *name; + char *aliased_name; + char *name_underscore; + char *path; + int path_a; + int path_b; + int bustype; + enum devtype type; + struct device *parent; + struct device *bus; + struct device *next; + struct device *nextdev; + struct device *children; + struct device *latestchild; + struct device *next_sibling; + struct device *sibling; + struct device *chip; + struct resource *res; + struct reg *reg; +} *head, *lastdev, *cur_parent, *cur_bus, root; + +struct header; +struct header { + char *name; + struct header *next; +} headers; + +int devcount = 0; + +struct device *new_dev() { + struct device *dev = malloc(sizeof(struct device)); + memset(dev, 0, sizeof(struct device)); + dev->id = ++devcount; + dev->parent = cur_parent; + dev->bus = cur_bus; + head->next = dev; + head = dev; + return dev; +} + +int device_match(struct device *a, struct device *b) { + if ((a->bustype == b->bustype) && (a->bus == b->bus) && (a->path_a == b->path_a) && (a->path_b == b->path_b)) + return 1; + return 0; +} + +void fold_in(struct device *parent) { + struct device *child = parent->children; + struct device *latest = 0; + while (child != latest) { + if (child->children) { + if (!latest) latest = child->children; + parent->latestchild->next_sibling = child->children; + parent->latestchild = child->latestchild; + } + child = child->next_sibling; + } +} + +int yywrap(void) { + return 1; +} + +void yyerror (char const *str) +{ + fprintf (stderr, "%s\n", str); +} + + +/* Line 189 of yacc.c */ +#line 199 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped" + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + CHIP = 258, + DEVICE = 259, + REGISTER = 260, + BOOL = 261, + BUS = 262, + RESOURCE = 263, + END = 264, + EQUALS = 265, + HEX = 266, + STRING = 267, + PCI = 268, + PNP = 269, + I2C = 270, + APIC = 271, + APIC_CLUSTER = 272, + PCI_DOMAIN = 273, + IRQ = 274, + DRQ = 275, + IO = 276, + NUMBER = 277 + }; +#endif + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +{ + +/* Line 214 of yacc.c */ +#line 125 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + + struct device *device; + char *string; + int number; + + + +/* Line 214 of yacc.c */ +#line 265 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +#endif + + +/* Copy the second part of user declarations. */ + + +/* Line 264 of yacc.c */ +#line 277 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped" + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int yyi) +#else +static int +YYID (yyi) + int yyi; +#endif +{ + return yyi; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 9 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 23 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 23 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 11 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 16 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 30 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 277 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint8 yyprhs[] = +{ + 0, 0, 3, 5, 7, 9, 12, 15, 16, 19, + 22, 23, 24, 30, 31, 39, 44 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = +{ + 24, 0, -1, 25, -1, 28, -1, 30, -1, 26, + 25, -1, 26, 33, -1, -1, 27, 25, -1, 27, + 32, -1, -1, -1, 3, 12, 29, 26, 9, -1, + -1, 4, 7, 22, 6, 31, 27, 9, -1, 8, + 22, 10, 22, -1, 5, 12, 10, 12, -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint16 yyrline[] = +{ + 0, 132, 132, 152, 152, 154, 154, 154, 156, 156, + 156, 158, 158, 214, 214, 293, 311 +}; +#endif + +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "CHIP", "DEVICE", "REGISTER", "BOOL", + "BUS", "RESOURCE", "END", "EQUALS", "HEX", "STRING", "PCI", "PNP", "I2C", + "APIC", "APIC_CLUSTER", "PCI_DOMAIN", "IRQ", "DRQ", "IO", "NUMBER", + "$accept", "devtree", "devchip", "devices", "devicesorresources", "chip", + "@1", "device", "@2", "resource", "registers", 0 +}; +#endif + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 23, 24, 25, 25, 26, 26, 26, 27, 27, + 27, 29, 28, 31, 30, 32, 33 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 1, 1, 2, 2, 0, 2, 2, + 0, 0, 5, 0, 7, 4, 4 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 0, 0, 0, 2, 3, 4, 11, 0, 1, + 7, 0, 0, 13, 0, 12, 5, 6, 10, 0, + 0, 0, 0, 14, 8, 9, 16, 0, 0, 15 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 3, 4, 12, 20, 5, 10, 6, 18, 25, + 17 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -13 +static const yytype_int8 yypact[] = +{ + 8, -6, 6, 14, -13, -13, -13, -13, -7, -13, + -13, 10, -2, -13, 5, -13, -13, -13, -13, 9, + 1, 11, -4, -13, -13, -13, -13, 12, -1, -13 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = +{ + -13, -13, -12, -13, -13, -13, -13, -13, -13, -13, + -13 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -1 +static const yytype_uint8 yytable[] = +{ + 16, 1, 2, 14, 1, 2, 7, 15, 24, 22, + 23, 1, 2, 8, 9, 11, 13, 19, 27, 21, + 0, 29, 28, 26 +}; + +static const yytype_int8 yycheck[] = +{ + 12, 3, 4, 5, 3, 4, 12, 9, 20, 8, + 9, 3, 4, 7, 0, 22, 6, 12, 22, 10, + -1, 22, 10, 12 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 3, 4, 24, 25, 28, 30, 12, 7, 0, + 29, 22, 26, 6, 5, 9, 25, 33, 31, 12, + 27, 10, 8, 9, 25, 32, 12, 22, 10, 22 +}; + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ + +#define YYFAIL goto yyerrlab + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) + + +#define YYTERROR 1 +#define YYERRCODE 256 + + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (YYLEX_PARAM) +#else +# define YYLEX yylex () +#endif + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +#else +static void +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; +#endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + YYFPRINTF (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static YYSIZE_T +yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static char * +yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ + + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; +#endif +{ + YYUSE (yyvaluep); + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { + + default: + break; + } +} + +/* Prevent warnings from -Wmissing-prototypes. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + + +/* The lookahead symbol. */ +int yychar; + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; + + + +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ + +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void) +#else +int +yyparse () + +#endif +#endif +{ + + + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; + + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yystacksize = YYINITDEPTH; + + YYDPRINTF ((stderr, "Starting parse\n")); + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + + /* Initialize stack pointers. + Waste one element of value and location stack + so that they stay on the same level as the state stack. + The wasted elements are never initialized. */ + yyssp = yyss; + yyvsp = yyvs; + + goto yysetstate; + +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. So pushing a state here evens the stacks. */ + yyssp++; + + yysetstate: + *yyssp = yystate; + + if (yyss + yystacksize - 1 <= yyssp) + { + /* Get the current used size of the three stacks, in elements. */ + YYSIZE_T yysize = yyssp - yyss + 1; + +#ifdef yyoverflow + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; + } +#else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyexhaustedlab; +# else + /* Extend the stack our own way. */ + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; + yystacksize *= 2; + if (YYMAXDEPTH < yystacksize) + yystacksize = YYMAXDEPTH; + + { + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif +#endif /* no yyoverflow */ + + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; + + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) + YYABORT; + } + + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + if (yystate == YYFINAL) + YYACCEPT; + + goto yybackup; + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: + + /* Do appropriate processing given the current state. Read a + lookahead token if we need one and don't already have one. */ + + /* First try to decide what to do without reference to lookahead token. */ + yyn = yypact[yystate]; + if (yyn == YYPACT_NINF) + goto yydefault; + + /* Not known => get a lookahead token if don't already have one. */ + + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + if (yychar == YYEMPTY) + { + YYDPRINTF ((stderr, "Reading a token: ")); + yychar = YYLEX; + } + + if (yychar <= YYEOF) + { + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); + } + else + { + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + } + + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) + goto yydefault; + yyn = yytable[yyn]; + if (yyn <= 0) + { + if (yyn == 0 || yyn == YYTABLE_NINF) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + /* Shift the lookahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token. */ + yychar = YYEMPTY; + + yystate = yyn; + *++yyvsp = yylval; + + goto yynewstate; + + +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + goto yyreduce; + + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ +yyreduce: + /* yyn is the number of a rule to reduce with. */ + yylen = yyr2[yyn]; + + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + + YY_REDUCE_PRINT (yyn); + switch (yyn) + { + case 2: + +/* Line 1455 of yacc.c */ +#line 132 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + { + root.next_sibling = root.children; + root.next_sibling->next_sibling = root.next_sibling->children; + + struct device *dev = &root; + while (dev) { + /* skip "chip" elements in children chain */ + while (dev->children && (dev->children->type == chip)) dev->children = dev->children->children; + /* skip "chip" elements and functions of the same device in sibling chain */ + while (dev->sibling && dev->sibling->used) dev->sibling = dev->sibling->sibling; + /* If end of chain, and parent is a chip, move on */ + if (!dev->sibling && (dev->parent->type == chip)) dev->sibling = dev->parent->sibling; + /* skip chips */ + while (dev->sibling && dev->sibling->type == chip) dev->sibling = dev->sibling->children; + /* skip duplicate function elements in nextdev chain */ + while (dev->nextdev && dev->nextdev->used) dev->nextdev = dev->nextdev->nextdev; + dev = dev->next_sibling; + } + ;} + break; + + case 11: + +/* Line 1455 of yacc.c */ +#line 158 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + { + (yyval.device) = new_dev(); + (yyval.device)->chiph_exists = 1; + (yyval.device)->name = (yyvsp[(2) - (2)].string); + (yyval.device)->name_underscore = strdup((yyval.device)->name); + char *c; + for (c = (yyval.device)->name_underscore; *c; c++) { + if (*c == '/') *c = '_'; + } + (yyval.device)->type = chip; + (yyval.device)->chip = (yyval.device); + + struct stat st; + char *chip_h = malloc(strlen((yyvsp[(2) - (2)].string))+12); + sprintf(chip_h, "src/%s/chip.h", (yyvsp[(2) - (2)].string)); + if ((stat(chip_h, &st) == -1) && (errno == ENOENT)) + (yyval.device)->chiph_exists = 0; + + if (cur_parent->latestchild) { + cur_parent->latestchild->next_sibling = (yyval.device); + cur_parent->latestchild->sibling = (yyval.device); + } + cur_parent->latestchild = (yyval.device); + if (!cur_parent->children) + cur_parent->children = (yyval.device); + + cur_parent = (yyval.device); +;} + break; + + case 12: + +/* Line 1455 of yacc.c */ +#line 186 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + { + cur_parent = (yyvsp[(3) - (5)].device)->parent; + + fold_in((yyvsp[(3) - (5)].device)); + + if ((yyvsp[(3) - (5)].device)->chiph_exists) { + int include_exists = 0; + struct header *h = &headers; + while (h->next) { + int result = strcmp((yyvsp[(3) - (5)].device)->name, h->next->name); + if (result == 0) { + include_exists = 1; + break; + } + if (result < 0) break; + h = h->next; + } + if (!include_exists) { + struct header *tmp = h->next; + h->next = malloc(sizeof(struct header)); + memset(h->next, 0, sizeof(struct header)); + h->next->name = (yyvsp[(3) - (5)].device)->name; + h->next->next = tmp; + break; + } + } +;} + break; + + case 13: + +/* Line 1455 of yacc.c */ +#line 214 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + { + (yyval.device) = new_dev(); + (yyval.device)->bustype = (yyvsp[(2) - (4)].number); + + char *tmp; + (yyval.device)->path_a = strtol(strdup((yyvsp[(3) - (4)].string)), &tmp, 16); + if (*tmp == '.') { + tmp++; + (yyval.device)->path_b = strtol(tmp, NULL, 16); + } + + char *name = malloc(10); + sprintf(name, "_dev%d", (yyval.device)->id); + (yyval.device)->name = name; + (yyval.device)->name_underscore = name; // shouldn't be necessary, but avoid 0-ptr + (yyval.device)->type = device; + (yyval.device)->enabled = (yyvsp[(4) - (4)].number); + (yyval.device)->chip = (yyval.device)->parent->chip; + + if (cur_parent->latestchild) { + cur_parent->latestchild->next_sibling = (yyval.device); + cur_parent->latestchild->sibling = (yyval.device); + } + cur_parent->latestchild = (yyval.device); + if (!cur_parent->children) + cur_parent->children = (yyval.device); + + lastdev->nextdev = (yyval.device); + lastdev = (yyval.device); + if ((yyvsp[(2) - (4)].number) == PCI) { + (yyval.device)->path = ".type=DEVICE_PATH_PCI,{.pci={ .devfn = PCI_DEVFN(0x%x,%d)}}"; + } + if ((yyvsp[(2) - (4)].number) == PNP) { + (yyval.device)->path = ".type=DEVICE_PATH_PNP,{.pnp={ .port = 0x%x, .device = 0x%x }}"; + } + if ((yyvsp[(2) - (4)].number) == I2C) { + (yyval.device)->path = ".type=DEVICE_PATH_I2C,{.i2c={ .device = 0x%x }}"; + } + if ((yyvsp[(2) - (4)].number) == APIC) { + (yyval.device)->path = ".type=DEVICE_PATH_APIC,{.apic={ .apic_id = 0x%x }}"; + } + if ((yyvsp[(2) - (4)].number) == APIC_CLUSTER) { + (yyval.device)->path = ".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}"; + } + if ((yyvsp[(2) - (4)].number) == PCI_DOMAIN) { + (yyval.device)->path = ".type=DEVICE_PATH_PCI_DOMAIN,{.pci_domain={ .domain = 0x%x }}"; + } + cur_parent = (yyval.device); + cur_bus = (yyval.device); +;} + break; + + case 14: + +/* Line 1455 of yacc.c */ +#line 264 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + { + cur_parent = (yyvsp[(5) - (7)].device)->parent; + cur_bus = (yyvsp[(5) - (7)].device)->bus; + + fold_in((yyvsp[(5) - (7)].device)); + + struct device *d = (yyvsp[(5) - (7)].device)->children; + while (d) { + int link = 0; + struct device *cmp = d->next_sibling; + while (cmp && (cmp->bus == d->bus) && (cmp->path_a == d->path_a) && (cmp->path_b == d->path_b)) { + if (cmp->type==device && !cmp->used) { + if (device_match(d, cmp)) { + d->multidev = 1; + + cmp->aliased_name = malloc(12); + sprintf(cmp->aliased_name, "_dev%d", cmp->id); + cmp->id = d->id; + cmp->name = d->name; + cmp->used = 1; + cmp->link = ++link; + } + } + cmp = cmp->next_sibling; + } + d = d->next_sibling; + } +;} + break; + + case 15: + +/* Line 1455 of yacc.c */ +#line 294 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + { + struct resource *r = malloc(sizeof(struct resource)); + memset (r, 0, sizeof(struct resource)); + r->type = (yyvsp[(1) - (4)].number); + r->index = strtol((yyvsp[(2) - (4)].string), NULL, 0); + r->base = strtol((yyvsp[(4) - (4)].string), NULL, 0); + if (cur_parent->res) { + struct resource *head = cur_parent->res; + while (head->next) head = head->next; + head->next = r; + } else { + cur_parent->res = r; + } + cur_parent->rescnt++; + ;} + break; + + case 16: + +/* Line 1455 of yacc.c */ +#line 312 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + { + struct reg *r = malloc(sizeof(struct reg)); + memset (r, 0, sizeof(struct reg)); + r->key = (yyvsp[(2) - (4)].string); + r->value = (yyvsp[(4) - (4)].string); + if (cur_parent->reg) { + struct reg *head = cur_parent->reg; + // sorting to be equal to sconfig's behaviour + int sort = strcmp(r->key, head->key); + if (sort == 0) { + printf("ERROR: duplicate 'register' key.\n"); + exit(1); + } + if (sort<0) { + r->next = head; + cur_parent->reg = r; + } else { + while ((head->next) && (strcmp(head->next->key, r->key)<0)) head = head->next; + r->next = head->next; + head->next = r; + } + } else { + cur_parent->reg = r; + } + ;} + break; + + + +/* Line 1455 of yacc.c */ +#line 1715 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped" + default: break; + } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + + *++yyvsp = yyval; + + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTOKENS]; + + goto yynewstate; + + +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) + { + ++yynerrs; +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif + } + + + + if (yyerrstatus == 3) + { + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ + + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } + } + + /* Else will try to reuse lookahead token after shifting the error + token. */ + goto yyerrlab1; + + +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; + + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; + + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ + + for (;;) + { + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } + + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; + + + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); + } + + *++yyvsp = yylval; + + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + + yystate = yyn; + goto yynewstate; + + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#if !defined(yyoverflow) || YYERROR_VERBOSE +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); + yyresult = 2; + /* Fall through. */ +#endif + +yyreturn: + if (yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); + } +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); +} + + + +/* Line 1675 of yacc.c */ +#line 339 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + +void pass0(FILE *fil, struct device *ptr) { + if ((ptr->type == device) && (ptr->id != 0) && (!ptr->used)) + fprintf(fil, "struct device %s;\n", ptr->name); + if ((ptr->type == device) && (ptr->id != 0) && ptr->used) + fprintf(fil, "struct device %s;\n", ptr->aliased_name); +} + +void pass1(FILE *fil, struct device *ptr) { + if (!ptr->used && (ptr->type == device)) { + fprintf(fil, "struct device %s = {\n", ptr->name); + fprintf(fil, "\t.ops = %s,\n", (ptr->ops)?(ptr->ops):"0"); + fprintf(fil, "\t.bus = &%s.link[%d],\n", ptr->bus->name, ptr->bus->link); + fprintf(fil, "\t.path = {"); + fprintf(fil, ptr->path, ptr->path_a, ptr->path_b); + fprintf(fil, "},\n"); + fprintf(fil, "\t.enabled = %d,\n", ptr->enabled); + fprintf(fil, "\t.on_mainboard = 1,\n"); + if (ptr->rescnt > 0) { + fprintf(fil, "\t.resources = %d,\n", ptr->rescnt); + fprintf(fil, "\t.resource = {\n"); + struct resource *r = ptr->res; + while (r) { + fprintf(fil, "\t\t{ .flags=IORESOURCE_FIXED | IORESOURCE_ASSIGNED | IORESOURCE_"); + if (r->type == IRQ) fprintf(fil, "IRQ"); + if (r->type == DRQ) fprintf(fil, "DRQ"); + if (r->type == IO) fprintf(fil, "IO"); + fprintf(fil, ", .index=0x%x, .base=0x%x},\n", r->index, r->base); + r = r->next; + } + fprintf(fil, "\t },\n"); + } + int link = 0; + fprintf(fil, "\t.link = {\n"); + if (ptr->multidev) { + struct device *d = ptr; + while (d) { + if (device_match(d, ptr)) { + fprintf(fil, "\t\t[%d] = {\n", d->link); + fprintf(fil, "\t\t\t.link = %d,\n", d->link); + fprintf(fil, "\t\t\t.dev = &%s,\n", d->name); + if (d->children) + fprintf(fil, "\t\t\t.children = &%s,\n", d->children->name); + fprintf(fil, "\t\t},\n"); + link++; + } + d = d->next_sibling; + } + } else { + if (ptr->children) { + fprintf(fil, "\t\t[0] = {\n"); + fprintf(fil, "\t\t\t.link = 0,\n"); + fprintf(fil, "\t\t\t.dev = &%s,\n", ptr->name); + fprintf(fil, "\t\t\t.children = &%s,\n", ptr->children->name); + fprintf(fil, "\t\t},\n"); + link++; + } + } + fprintf(fil, "\t},\n"); + fprintf(fil, "\t.links = %d,\n", link); + if (ptr->sibling) + fprintf(fil, "\t.sibling = &%s,\n", ptr->sibling->name); + if (ptr->chip->chiph_exists) { + fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore); + fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id); + } + if (ptr->nextdev) + fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name); + fprintf(fil, "};\n"); + } + if ((ptr->type == chip) && (ptr->chiph_exists)) { + if (ptr->reg) { + fprintf(fil, "struct %s_config %s_info_%d\t= {\n", ptr->name_underscore, ptr->name_underscore, ptr->id); + struct reg *r = ptr->reg; + while (r) { + fprintf(fil, "\t.%s = %s,\n", r->key, r->value); + r = r->next; + } + fprintf(fil, "};\n\n"); + } else { + fprintf(fil, "struct %s_config %s_info_%d;\n", ptr->name_underscore, ptr->name_underscore, ptr->id); + } + } +} + +void walk_device_tree(FILE *fil, struct device *ptr, void (*func)(FILE *, struct device*), struct device *chips) { + do { + func(fil, ptr); + ptr = ptr->next_sibling; + } while (ptr); +} + +struct device mainboard = { + .name = "mainboard", + .name_underscore = "mainboard", + .id = 0, + .chip = &mainboard, + .type = chip, + .chiph_exists = 1, + .children = &root +}; + +struct device root = { + .name = "dev_root", + .name_underscore = "dev_root", + .id = 0, + .chip = &mainboard, + .type = device, + .path = " .type = DEVICE_PATH_ROOT ", + .ops = "&default_dev_ops_root", + .parent = &root, + .bus = &root, + .enabled = 1 +}; + +int main(int argc, char** argv) { + if (argc != 3) { + printf("usage: sconfig vendor/mainboard outputdir\n"); + return 1; + } + char *mainboard=argv[1]; + char *outputdir=argv[2]; + char *devtree=malloc(strlen(mainboard)+30); + char *outputc=malloc(strlen(outputdir)+10); + sprintf(devtree, "src/mainboard/%s/devicetree.cb", mainboard); + sprintf(outputc, "%s/static.c", outputdir); + + headers.next = malloc(sizeof(struct header)); + headers.next->name = malloc(strlen(mainboard)+12); + headers.next->next = 0; + sprintf(headers.next->name, "mainboard/%s", mainboard); + + FILE *filec = fopen(devtree, "r"); + yyrestart(filec); + + FILE *staticc = fopen(outputc, "w"); + + cur_bus = cur_parent = lastdev = head = &root; + yyparse(); + fclose(filec); + + if ((head->type == chip) && (!head->chiph_exists)) { + struct device *tmp = head; + head = &root; + while (head->next != tmp) head = head->next; + } + + fprintf(staticc, "#include <device/device.h>\n"); + fprintf(staticc, "#include <device/pci.h>\n"); + struct header *h = &headers; + while (h->next) { + h = h->next; + fprintf(staticc, "#include \"%s/chip.h\"\n", h->name); + } + fprintf(staticc, "\n/* pass 0 */\n"); + walk_device_tree(staticc, &root, pass0, NULL); + fprintf(staticc, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\nstruct device **last_dev_p = &%s.next;\n", lastdev->name); + walk_device_tree(staticc, &root, pass1, NULL); + + fclose(staticc); +} + Added: trunk/util/sconfig/sconfig.tab.h_shipped ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/sconfig/sconfig.tab.h_shipped Thu Apr 8 13:37:43 2010 (r5373) @@ -0,0 +1,90 @@ + +/* A Bison parser, made by GNU Bison 2.4.1. */ + +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + CHIP = 258, + DEVICE = 259, + REGISTER = 260, + BOOL = 261, + BUS = 262, + RESOURCE = 263, + END = 264, + EQUALS = 265, + HEX = 266, + STRING = 267, + PCI = 268, + PNP = 269, + I2C = 270, + APIC = 271, + APIC_CLUSTER = 272, + PCI_DOMAIN = 273, + IRQ = 274, + DRQ = 275, + IO = 276, + NUMBER = 277 + }; +#endif + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +{ + +/* Line 1676 of yacc.c */ +#line 125 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y" + + struct device *device; + char *string; + int number; + + + +/* Line 1676 of yacc.c */ +#line 82 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.h_shipped" +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +#endif + +extern YYSTYPE yylval; + + Added: trunk/util/sconfig/sconfig.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/util/sconfig/sconfig.y Thu Apr 8 13:37:43 2010 (r5373) @@ -0,0 +1,499 @@ +%{ +/* + * sconfig, coreboot device tree compiler + * + * Copyright (C) 2010 coresystems GmbH + * written by Patrick Georgi <patrick.georgi(a)coresystems.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <errno.h> + +enum devtype { chip, device }; + +struct resource; +struct resource { + int type; + int index; + int base; + struct resource *next; +}; + +struct reg; +struct reg { + char *key; + char *value; + struct reg *next; +}; + +struct device; +struct device { + int id; + int enabled; + int used; + int multidev; + int link; + int rescnt; + int chiph_exists; + char *ops; + char *name; + char *aliased_name; + char *name_underscore; + char *path; + int path_a; + int path_b; + int bustype; + enum devtype type; + struct device *parent; + struct device *bus; + struct device *next; + struct device *nextdev; + struct device *children; + struct device *latestchild; + struct device *next_sibling; + struct device *sibling; + struct device *chip; + struct resource *res; + struct reg *reg; +} *head, *lastdev, *cur_parent, *cur_bus, root; + +struct header; +struct header { + char *name; + struct header *next; +} headers; + +int devcount = 0; + +struct device *new_dev() { + struct device *dev = malloc(sizeof(struct device)); + memset(dev, 0, sizeof(struct device)); + dev->id = ++devcount; + dev->parent = cur_parent; + dev->bus = cur_bus; + head->next = dev; + head = dev; + return dev; +} + +int device_match(struct device *a, struct device *b) { + if ((a->bustype == b->bustype) && (a->bus == b->bus) && (a->path_a == b->path_a) && (a->path_b == b->path_b)) + return 1; + return 0; +} + +void fold_in(struct device *parent) { + struct device *child = parent->children; + struct device *latest = 0; + while (child != latest) { + if (child->children) { + if (!latest) latest = child->children; + parent->latestchild->next_sibling = child->children; + parent->latestchild = child->latestchild; + } + child = child->next_sibling; + } +} + +int yywrap(void) { + return 1; +} + +void yyerror (char const *str) +{ + fprintf (stderr, "%s\n", str); +} +%} +%union { + struct device *device; + char *string; + int number; +} +%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC APIC_CLUSTER PCI_DOMAIN IRQ DRQ IO NUMBER +%% +devtree: devchip { + root.next_sibling = root.children; + root.next_sibling->next_sibling = root.next_sibling->children; + + struct device *dev = &root; + while (dev) { + /* skip "chip" elements in children chain */ + while (dev->children && (dev->children->type == chip)) dev->children = dev->children->children; + /* skip "chip" elements and functions of the same device in sibling chain */ + while (dev->sibling && dev->sibling->used) dev->sibling = dev->sibling->sibling; + /* If end of chain, and parent is a chip, move on */ + if (!dev->sibling && (dev->parent->type == chip)) dev->sibling = dev->parent->sibling; + /* skip chips */ + while (dev->sibling && dev->sibling->type == chip) dev->sibling = dev->sibling->children; + /* skip duplicate function elements in nextdev chain */ + while (dev->nextdev && dev->nextdev->used) dev->nextdev = dev->nextdev->nextdev; + dev = dev->next_sibling; + } + }; + +devchip: chip | device ; + +devices: devices devchip | devices registers | ; + +devicesorresources: devicesorresources devchip | devicesorresources resource | ; + +chip: CHIP STRING /* == path */ { + $<device>$ = new_dev(); + $<device>$->chiph_exists = 1; + $<device>$->name = $<string>2; + $<device>$->name_underscore = strdup($<device>$->name); + char *c; + for (c = $<device>$->name_underscore; *c; c++) { + if (*c == '/') *c = '_'; + } + $<device>$->type = chip; + $<device>$->chip = $<device>$; + + struct stat st; + char *chip_h = malloc(strlen($<string>2)+12); + sprintf(chip_h, "src/%s/chip.h", $<string>2); + if ((stat(chip_h, &st) == -1) && (errno == ENOENT)) + $<device>$->chiph_exists = 0; + + if (cur_parent->latestchild) { + cur_parent->latestchild->next_sibling = $<device>$; + cur_parent->latestchild->sibling = $<device>$; + } + cur_parent->latestchild = $<device>$; + if (!cur_parent->children) + cur_parent->children = $<device>$; + + cur_parent = $<device>$; +} + devices END { + cur_parent = $<device>3->parent; + + fold_in($<device>3); + + if ($<device>3->chiph_exists) { + int include_exists = 0; + struct header *h = &headers; + while (h->next) { + int result = strcmp($<device>3->name, h->next->name); + if (result == 0) { + include_exists = 1; + break; + } + if (result < 0) break; + h = h->next; + } + if (!include_exists) { + struct header *tmp = h->next; + h->next = malloc(sizeof(struct header)); + memset(h->next, 0, sizeof(struct header)); + h->next->name = $<device>3->name; + h->next->next = tmp; + break; + } + } +}; + +device: DEVICE BUS NUMBER /* == devnum */ BOOL { + $<device>$ = new_dev(); + $<device>$->bustype = $<number>2; + + char *tmp; + $<device>$->path_a = strtol(strdup($<string>3), &tmp, 16); + if (*tmp == '.') { + tmp++; + $<device>$->path_b = strtol(tmp, NULL, 16); + } + + char *name = malloc(10); + sprintf(name, "_dev%d", $<device>$->id); + $<device>$->name = name; + $<device>$->name_underscore = name; // shouldn't be necessary, but avoid 0-ptr + $<device>$->type = device; + $<device>$->enabled = $<number>4; + $<device>$->chip = $<device>$->parent->chip; + + if (cur_parent->latestchild) { + cur_parent->latestchild->next_sibling = $<device>$; + cur_parent->latestchild->sibling = $<device>$; + } + cur_parent->latestchild = $<device>$; + if (!cur_parent->children) + cur_parent->children = $<device>$; + + lastdev->nextdev = $<device>$; + lastdev = $<device>$; + if ($<number>2 == PCI) { + $<device>$->path = ".type=DEVICE_PATH_PCI,{.pci={ .devfn = PCI_DEVFN(0x%x,%d)}}"; + } + if ($<number>2 == PNP) { + $<device>$->path = ".type=DEVICE_PATH_PNP,{.pnp={ .port = 0x%x, .device = 0x%x }}"; + } + if ($<number>2 == I2C) { + $<device>$->path = ".type=DEVICE_PATH_I2C,{.i2c={ .device = 0x%x }}"; + } + if ($<number>2 == APIC) { + $<device>$->path = ".type=DEVICE_PATH_APIC,{.apic={ .apic_id = 0x%x }}"; + } + if ($<number>2 == APIC_CLUSTER) { + $<device>$->path = ".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}"; + } + if ($<number>2 == PCI_DOMAIN) { + $<device>$->path = ".type=DEVICE_PATH_PCI_DOMAIN,{.pci_domain={ .domain = 0x%x }}"; + } + cur_parent = $<device>$; + cur_bus = $<device>$; +} + devicesorresources END { + cur_parent = $<device>5->parent; + cur_bus = $<device>5->bus; + + fold_in($<device>5); + + struct device *d = $<device>5->children; + while (d) { + int link = 0; + struct device *cmp = d->next_sibling; + while (cmp && (cmp->bus == d->bus) && (cmp->path_a == d->path_a) && (cmp->path_b == d->path_b)) { + if (cmp->type==device && !cmp->used) { + if (device_match(d, cmp)) { + d->multidev = 1; + + cmp->aliased_name = malloc(12); + sprintf(cmp->aliased_name, "_dev%d", cmp->id); + cmp->id = d->id; + cmp->name = d->name; + cmp->used = 1; + cmp->link = ++link; + } + } + cmp = cmp->next_sibling; + } + d = d->next_sibling; + } +}; + +resource: RESOURCE NUMBER /* == resnum */ EQUALS NUMBER /* == resval */ + { + struct resource *r = malloc(sizeof(struct resource)); + memset (r, 0, sizeof(struct resource)); + r->type = $<number>1; + r->index = strtol($<string>2, NULL, 0); + r->base = strtol($<string>4, NULL, 0); + if (cur_parent->res) { + struct resource *head = cur_parent->res; + while (head->next) head = head->next; + head->next = r; + } else { + cur_parent->res = r; + } + cur_parent->rescnt++; + } + ; + +registers: REGISTER STRING /* == regname */ EQUALS STRING /* == regval */ + { + struct reg *r = malloc(sizeof(struct reg)); + memset (r, 0, sizeof(struct reg)); + r->key = $<string>2; + r->value = $<string>4; + if (cur_parent->reg) { + struct reg *head = cur_parent->reg; + // sorting to be equal to sconfig's behaviour + int sort = strcmp(r->key, head->key); + if (sort == 0) { + printf("ERROR: duplicate 'register' key.\n"); + exit(1); + } + if (sort<0) { + r->next = head; + cur_parent->reg = r; + } else { + while ((head->next) && (strcmp(head->next->key, r->key)<0)) head = head->next; + r->next = head->next; + head->next = r; + } + } else { + cur_parent->reg = r; + } + } + ; + +%% +void pass0(FILE *fil, struct device *ptr) { + if ((ptr->type == device) && (ptr->id != 0) && (!ptr->used)) + fprintf(fil, "struct device %s;\n", ptr->name); + if ((ptr->type == device) && (ptr->id != 0) && ptr->used) + fprintf(fil, "struct device %s;\n", ptr->aliased_name); +} + +void pass1(FILE *fil, struct device *ptr) { + if (!ptr->used && (ptr->type == device)) { + fprintf(fil, "struct device %s = {\n", ptr->name); + fprintf(fil, "\t.ops = %s,\n", (ptr->ops)?(ptr->ops):"0"); + fprintf(fil, "\t.bus = &%s.link[%d],\n", ptr->bus->name, ptr->bus->link); + fprintf(fil, "\t.path = {"); + fprintf(fil, ptr->path, ptr->path_a, ptr->path_b); + fprintf(fil, "},\n"); + fprintf(fil, "\t.enabled = %d,\n", ptr->enabled); + fprintf(fil, "\t.on_mainboard = 1,\n"); + if (ptr->rescnt > 0) { + fprintf(fil, "\t.resources = %d,\n", ptr->rescnt); + fprintf(fil, "\t.resource = {\n"); + struct resource *r = ptr->res; + while (r) { + fprintf(fil, "\t\t{ .flags=IORESOURCE_FIXED | IORESOURCE_ASSIGNED | IORESOURCE_"); + if (r->type == IRQ) fprintf(fil, "IRQ"); + if (r->type == DRQ) fprintf(fil, "DRQ"); + if (r->type == IO) fprintf(fil, "IO"); + fprintf(fil, ", .index=0x%x, .base=0x%x},\n", r->index, r->base); + r = r->next; + } + fprintf(fil, "\t },\n"); + } + int link = 0; + fprintf(fil, "\t.link = {\n"); + if (ptr->multidev) { + struct device *d = ptr; + while (d) { + if (device_match(d, ptr)) { + fprintf(fil, "\t\t[%d] = {\n", d->link); + fprintf(fil, "\t\t\t.link = %d,\n", d->link); + fprintf(fil, "\t\t\t.dev = &%s,\n", d->name); + if (d->children) + fprintf(fil, "\t\t\t.children = &%s,\n", d->children->name); + fprintf(fil, "\t\t},\n"); + link++; + } + d = d->next_sibling; + } + } else { + if (ptr->children) { + fprintf(fil, "\t\t[0] = {\n"); + fprintf(fil, "\t\t\t.link = 0,\n"); + fprintf(fil, "\t\t\t.dev = &%s,\n", ptr->name); + fprintf(fil, "\t\t\t.children = &%s,\n", ptr->children->name); + fprintf(fil, "\t\t},\n"); + link++; + } + } + fprintf(fil, "\t},\n"); + fprintf(fil, "\t.links = %d,\n", link); + if (ptr->sibling) + fprintf(fil, "\t.sibling = &%s,\n", ptr->sibling->name); + if (ptr->chip->chiph_exists) { + fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore); + fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id); + } + if (ptr->nextdev) + fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name); + fprintf(fil, "};\n"); + } + if ((ptr->type == chip) && (ptr->chiph_exists)) { + if (ptr->reg) { + fprintf(fil, "struct %s_config %s_info_%d\t= {\n", ptr->name_underscore, ptr->name_underscore, ptr->id); + struct reg *r = ptr->reg; + while (r) { + fprintf(fil, "\t.%s = %s,\n", r->key, r->value); + r = r->next; + } + fprintf(fil, "};\n\n"); + } else { + fprintf(fil, "struct %s_config %s_info_%d;\n", ptr->name_underscore, ptr->name_underscore, ptr->id); + } + } +} + +void walk_device_tree(FILE *fil, struct device *ptr, void (*func)(FILE *, struct device*), struct device *chips) { + do { + func(fil, ptr); + ptr = ptr->next_sibling; + } while (ptr); +} + +struct device mainboard = { + .name = "mainboard", + .name_underscore = "mainboard", + .id = 0, + .chip = &mainboard, + .type = chip, + .chiph_exists = 1, + .children = &root +}; + +struct device root = { + .name = "dev_root", + .name_underscore = "dev_root", + .id = 0, + .chip = &mainboard, + .type = device, + .path = " .type = DEVICE_PATH_ROOT ", + .ops = "&default_dev_ops_root", + .parent = &root, + .bus = &root, + .enabled = 1 +}; + +int main(int argc, char** argv) { + if (argc != 3) { + printf("usage: sconfig vendor/mainboard outputdir\n"); + return 1; + } + char *mainboard=argv[1]; + char *outputdir=argv[2]; + char *devtree=malloc(strlen(mainboard)+30); + char *outputc=malloc(strlen(outputdir)+10); + sprintf(devtree, "src/mainboard/%s/devicetree.cb", mainboard); + sprintf(outputc, "%s/static.c", outputdir); + + headers.next = malloc(sizeof(struct header)); + headers.next->name = malloc(strlen(mainboard)+12); + headers.next->next = 0; + sprintf(headers.next->name, "mainboard/%s", mainboard); + + FILE *filec = fopen(devtree, "r"); + yyrestart(filec); + + FILE *staticc = fopen(outputc, "w"); + + cur_bus = cur_parent = lastdev = head = &root; + yyparse(); + fclose(filec); + + if ((head->type == chip) && (!head->chiph_exists)) { + struct device *tmp = head; + head = &root; + while (head->next != tmp) head = head->next; + } + + fprintf(staticc, "#include <device/device.h>\n"); + fprintf(staticc, "#include <device/pci.h>\n"); + struct header *h = &headers; + while (h->next) { + h = h->next; + fprintf(staticc, "#include \"%s/chip.h\"\n", h->name); + } + fprintf(staticc, "\n/* pass 0 */\n"); + walk_device_tree(staticc, &root, pass0, NULL); + fprintf(staticc, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\nstruct device **last_dev_p = &%s.next;\n", lastdev->name); + walk_device_tree(staticc, &root, pass1, NULL); + + fclose(staticc); +}

1 0

[PREVIEW]sconfig in C
by Patrick Georgi 08 Apr '10

08 Apr '10

Hi, attached you'll find a couple of files: - sconfig.py.diff which is a patch against our current sconfig. The patch makes sconfig's output more predictable, by * reordering hard coded output so its elements match the order of the generated output * sorting registers alphanumerically by key * sorting headers alphanumerically. The third part contains a hack as I couldn't convince python that it should sort src/northbridge/amd/amdk8/root_complex/chip.h _after_ src/northbridge/amd/amdk8/chip.h (and the same for fam10) This patch makes the output of sconfig more regular, but should otherwise not affect functionality. The other files provide an implementation of sconfig in C. This has a couple of advantages: 1. We do not rely on python any longer 2. We use a commonly used compiler compiler (instead of yapps2) 3. It's faster (by a factor of 20, not that this matters much in absolute numbers) 4. It's smaller: 511LOC vs. 1035LOC (both excluding the compiler compiler), with code to drop once the byte-for-byte compatibility with python-sconfig can go. sconfig.l and sconfig.y give you (with the help of bison and flex) an implementation of sconfig in C. I wrote a script that mass generated static.c files for all mainboards both with the python and the C version and diffed the results. With the patch to python-sconfig, these diffs are empty. There are a couple of things left to do with the C version: - Hook up to the build system (in a way that flex and bison are optional dependencies, ie. deliver and by default use prebuilt results) - Add static.dot generation code. This should be reasonably easy, now that the parsing and rewiring between the components is done. The emitter is a separate phase which doesn't change the internal device tree model. - Clean up: -- There are various overly complicated things in the code to precisely match python-sconfig output where it wouldn't matter except to aid with the comparison (the order of the structs and includes) -- It's not so nice to stuff all the C code in sconfig.y. Parser and processing code should be split more sensibly. -- Naming: A couple of variables changed meaning over their life time. That's stable now, so they should be named intuitively. -- Strict parsing: For example, only accept registers for chips (python-sconfig doesn't do that properly, either) Yet, I'd prefer to get the python-sconfig patch in, and the C code as similar to the current state as possible - It's known to give useful results. That way, further development provides history, so we can triage bugs more easily. For the python patch, I'd need some help by someone with python knowledge about why it sorts the strings the way it does (the root_complex hack isn't acceptable for upstream) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

3 3

[commit] r5372 - in trunk/src: cpu/amd/car cpu/via/car mainboard/asrock/939a785gmh mainboard/digitallogic/msm586seg mainboard/gigabyte/ga_2761gxdk mainboard/jetway/j7f24 mainboard/via/epia mainboar...
by repository service 07 Apr '10

07 Apr '10

Author: stepan Date: Wed Apr 7 17:40:26 2010 New Revision: 5372 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5372 Log: - copy_and_run() gets the same calling convention on AMD and on all the others. - some vx800 Kconfig fixes - remove warnings... Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/cpu/amd/car/copy_and_run.c trunk/src/cpu/amd/car/post_cache_as_ram.c trunk/src/cpu/via/car/cache_as_ram.lds trunk/src/mainboard/asrock/939a785gmh/romstage.c trunk/src/mainboard/digitallogic/msm586seg/mainboard.c trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/jetway/j7f24/romstage.c trunk/src/mainboard/via/epia-m700/fadt.c trunk/src/mainboard/via/epia-m700/romstage.c trunk/src/mainboard/via/epia-m700/wakeup.c trunk/src/mainboard/via/epia/romstage.c trunk/src/northbridge/via/vx800/northbridge.c trunk/src/northbridge/via/vx800/pci_rawops.h trunk/src/northbridge/via/vx800/vx800_ide.c trunk/src/northbridge/via/vx800/vx800_lpc.c Modified: trunk/src/cpu/amd/car/copy_and_run.c ============================================================================== --- trunk/src/cpu/amd/car/copy_and_run.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/cpu/amd/car/copy_and_run.c Wed Apr 7 17:40:26 2010 (r5372) @@ -1,17 +1,30 @@ -/* by yhlu 6.2005 - moved from nrv2v.c and some lines from crt0.S - 2006/05/02 - stepan: move nrv2b to an extra file. -*/ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2009-2010 coresystems GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ void cbfs_and_run_core(const char *filename, unsigned ebp); -static void copy_and_run(void) +static void copy_and_run(unsigned cpu_reset) { - cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", 0); + cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", cpu_reset); } #if CONFIG_AP_CODE_IN_CAR == 1 - static void copy_and_run_ap_code_in_car(unsigned ret_addr) { cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ap", ret_addr); Modified: trunk/src/cpu/amd/car/post_cache_as_ram.c ============================================================================== --- trunk/src/cpu/amd/car/post_cache_as_ram.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/cpu/amd/car/post_cache_as_ram.c Wed Apr 7 17:40:26 2010 (r5372) @@ -112,7 +112,7 @@ // wait_all_core0_mem_trained(sysinfox); // moved to lapic_init_cpus.c #endif /*copy and execute coreboot_ram */ - copy_and_run(); + copy_and_run(0); /* We will not return */ print_debug("should not be here -\n"); Modified: trunk/src/cpu/via/car/cache_as_ram.lds ============================================================================== --- trunk/src/cpu/via/car/cache_as_ram.lds Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/cpu/via/car/cache_as_ram.lds Wed Apr 7 17:40:26 2010 (r5372) @@ -27,5 +27,4 @@ . = ALIGN(16); _einit = .; } - } Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/romstage.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/asrock/939a785gmh/romstage.c Wed Apr 7 17:40:26 2010 (r5372) @@ -102,7 +102,7 @@ #include "northbridge/amd/amdk8/early_ht.c" -void sio_init(void) +static void sio_init(void) { u8 reg; Modified: trunk/src/mainboard/digitallogic/msm586seg/mainboard.c ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/mainboard.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/digitallogic/msm586seg/mainboard.c Wed Apr 7 17:40:26 2010 (r5372) @@ -7,12 +7,10 @@ #include "chip.h" -static void irqdump() +static void irqdump(void) { volatile unsigned char *irq; void *mmcr; - - int i; int irqlist[] = {0xd00, 0xd02, 0xd03, 0xd04, 0xd08, 0xd0a, 0xd14, 0xd18, 0xd1a, 0xd1b, 0xd1c, @@ -34,8 +32,9 @@ /* TODO: finish up mmcr struct in sc520.h, and; - set ADDDECTL (now done in raminit.c in cpu/amd/sc520 */ -static void enable_dev(struct device *dev) { - volatile struct mmcrpic *pic = MMCRPIC; +static void enable_dev(struct device *dev) +{ + //volatile struct mmcrpic *pic = MMCRPIC; volatile struct mmcr *mmcr = MMCRDEFAULT; /* msm586seg has this register set to a weird value. @@ -72,15 +71,11 @@ mmcr->pic.gp10imap = 0x9; mmcr->pic.gp9imap = 0x4; - - - - irqdump(); printk(BIOS_ERR, "uart 1 ctl is 0x%x\n", *(unsigned char *) 0xfffefcc0); printk(BIOS_ERR, "0xc20 ctl is 0x%x\n", *(unsigned short *) 0xfffefc20); - printk(BIOS_ERR, "0xc22 0x%x\n", *(unsigned short *) 0xfffefc22b); + printk(BIOS_ERR, "0xc22 0x%x\n", *(unsigned short *) 0xfffefc22); /* The following block has NOT proven sufficient to get * the VGA hardware to talk to us @@ -124,7 +119,7 @@ /* still not interrupts. */ /* their IRQ table is wrong. Just hardwire it */ { - char pciints[4] = {15, 15, 15, 15}; + unsigned char pciints[4] = {15, 15, 15, 15}; pci_assign_irqs(0, 12, pciints); } /* the assigned failed but we just noticed -- there is no @@ -133,6 +128,7 @@ /* follow fuctory here */ mmcr->dmacontrol.extchanmapa = 0x3210; } + struct chip_operations mainboard_ops = { CHIP_NAME("DIGITAL-LOGIC MSM586SEG Mainboard") .enable_dev = enable_dev Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Wed Apr 7 17:40:26 2010 (r5372) @@ -146,8 +146,6 @@ static void sio_setup(void) { - - unsigned value; uint32_t dword; uint8_t byte; @@ -175,7 +173,8 @@ #endif }; - struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); + struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); int needs_reset = 0; unsigned bsp_apicid = 0; Modified: trunk/src/mainboard/jetway/j7f24/romstage.c ============================================================================== --- trunk/src/mainboard/jetway/j7f24/romstage.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/jetway/j7f24/romstage.c Wed Apr 7 17:40:26 2010 (r5372) @@ -44,10 +44,6 @@ #define SERIAL_DEV PNP_DEV(0x2e, F71805F_SP1) #endif -static void memreset_setup(void) -{ -} - static inline int spd_read_byte(unsigned device, unsigned address) { return smbus_read_byte(device, address); @@ -93,9 +89,6 @@ static void main(unsigned long bist) { - unsigned long x; - device_t dev; - /* Enable multifunction for northbridge. */ pci_write_config8(ctrl.d0f0, 0x4f, 0x01); Modified: trunk/src/mainboard/via/epia-m700/fadt.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/fadt.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/via/epia-m700/fadt.c Wed Apr 7 17:40:26 2010 (r5372) @@ -36,8 +36,8 @@ memcpy(header->asl_compiler_id, "LXB", 8); header->asl_compiler_revision = 0; - fadt->firmware_ctrl = facs; - fadt->dsdt = dsdt; + fadt->firmware_ctrl = (u32)facs; + fadt->dsdt = (u32)dsdt; fadt->preferred_pm_profile = 0; fadt->sci_int = 0x9; @@ -105,9 +105,9 @@ fadt->reset_reg.addrh = 0x0; fadt->reset_value = 0; - fadt->x_firmware_ctl_l = facs; + fadt->x_firmware_ctl_l = (u32)facs; fadt->x_firmware_ctl_h = 0; - fadt->x_dsdt_l = dsdt; + fadt->x_dsdt_l = (u32)dsdt; fadt->x_dsdt_h = 0; fadt->x_pm1a_evt_blk.space_id = 1; Modified: trunk/src/mainboard/via/epia-m700/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/romstage.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/via/epia-m700/romstage.c Wed Apr 7 17:40:26 2010 (r5372) @@ -41,7 +41,6 @@ #include "pc80/udelay_io.c" #include "lib/delay.c" #include <string.h> -#include "cpu/x86/lapic/boot_cpu.c" /* This file contains the board-special SI value for raminit.c. */ #include "driving_clk_phase_data.c" @@ -59,18 +58,6 @@ * This acpi_is_wakeup_early_via_VX800 is from Rudolf's patch on the list: * http://www.coreboot.org/pipermail/coreboot/2008-January/028787.html. */ -void jason_tsc_count_car(void) -{ -#if 0 - unsigned long long start; - asm volatile ("rdtsc" : "=A" (start)); - start >>= 20; - print_emerg("jason_tsc_count_car= "); - print_emerg_hex32((unsigned long) start); - print_emerg("\n"); -#endif -} - int acpi_is_wakeup_early_via_vx800(void) { device_t dev; @@ -431,8 +418,6 @@ * g) Rx73h = 32h */ - jason_tsc_count_car(); - pci_write_config16(PCI_DEV(0, 0xf, 0), 0xBA, PCI_DEVICE_ID_VIA_VX855_IDE); pci_write_config16(PCI_DEV(0, 0xf, 0), 0xBE, @@ -462,7 +447,6 @@ * written, then this must be a CPU restart (result of OS reboot cmd), * so we need a real "cold boot". */ - jason_tsc_count_car(); if ((boot_mode != 3) && (pci_read_config8(PCI_DEV(0, 0, 3), 0x80) != 0)) { outb(6, 0xcf9); @@ -471,7 +455,6 @@ /* x86 cold boot I/O cmd. */ /* These 2 lines are the same with epia-cn port. */ enable_smbus(); - jason_tsc_count_car(); /* This fix does help vx800!, but vx855 doesn't need this. */ /* smbus_fixup(&ctrl); */ @@ -564,8 +547,6 @@ /* This line is the same with cx700 port. */ enable_shadow_ram(); - jason_tsc_count_car(); - /* * For coreboot most time of S3 resume is the same as normal boot, * so some memory area under 1M become dirty, so before this happen, @@ -801,7 +782,6 @@ print_debug("\n"); #endif - jason_tsc_count_car(); /* Copy and execute coreboot_ram. */ copy_and_run(new_cpu_reset); /* We will not return. */ Modified: trunk/src/mainboard/via/epia-m700/wakeup.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/wakeup.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/via/epia-m700/wakeup.c Wed Apr 7 17:40:26 2010 (r5372) @@ -111,9 +111,7 @@ void acpi_jump_wake(u32 vector) { - u32 tmp, dwEip; - u16 tmpvector; - u8 Data; + u32 dwEip; struct Xgt_desc_struct *wake_thunk16_Xgt_desc; printk(BIOS_DEBUG, "IN ACPI JUMP WAKE TO %x\n", vector); Modified: trunk/src/mainboard/via/epia/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia/romstage.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/mainboard/via/epia/romstage.c Wed Apr 7 17:40:26 2010 (r5372) @@ -75,7 +75,7 @@ pci_write_config8(dev, 0x63, shadowreg); } -void main(unsigned long bist) +static void main(unsigned long bist) { if (bist == 0) { early_mtrr_init(); Modified: trunk/src/northbridge/via/vx800/northbridge.c ============================================================================== --- trunk/src/northbridge/via/vx800/northbridge.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/northbridge/via/vx800/northbridge.c Wed Apr 7 17:40:26 2010 (r5372) @@ -142,7 +142,6 @@ * this register's value multiply 64 * 1024 * 1024 */ for (rambits = 0, i = 0; i < ARRAY_SIZE(ramregs); i++) { - unsigned char reg; rambits = pci_read_config8(mc_dev, ramregs[i]); if (rambits != 0) break; @@ -179,7 +178,7 @@ assign_resources(&dev->link[0]); } -static const struct device_operations pci_domain_ops = { +static struct device_operations pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, .enable_resources = enable_childrens_resources, @@ -196,7 +195,7 @@ { } -static const struct device_operations cpu_bus_ops = { +static struct device_operations cpu_bus_ops = { .read_resources = cpu_bus_noop, .set_resources = cpu_bus_noop, .enable_resources = cpu_bus_noop, Modified: trunk/src/northbridge/via/vx800/pci_rawops.h ============================================================================== --- trunk/src/northbridge/via/vx800/pci_rawops.h Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/northbridge/via/vx800/pci_rawops.h Wed Apr 7 17:40:26 2010 (r5372) @@ -26,243 +26,260 @@ (((SEGBUS) & 0xFFF) << 20) | \ (((DEV) & 0x1F) << 15) | \ (((FN) & 0x07) << 12)) -struct VIA_PCI_REG_INIT_TABLE { + +struct VIA_PCI_REG_INIT_TABLE { u8 ChipRevisionStart; u8 ChipRevisionEnd; u8 Bus; u8 Device; u8 Function; - u32 Register; + u32 Register; u8 Mask; u8 Value; }; -typedef unsigned device_t_raw; /* pci and pci_mmio need to have different ways to have dev */ +typedef unsigned device_t_raw; /* pci and pci_mmio need to have different ways to have dev */ /* FIXME: We need to make the coreboot to run at 64bit mode, So when read/write memory above 4G, * We don't need to set %fs, and %gs anymore * Before that We need to use %gs, and leave %fs to other RAM access */ - uint8_t pci_io_rawread_config8(device_t_raw dev, unsigned where) +u8 pci_io_rawread_config8(device_t_raw dev, unsigned where) { unsigned addr; -#if PCI_IO_CFG_EXT == 0 - addr = (dev>>4) | where; +#if CONFIG_PCI_IO_CFG_EXT == 0 + addr = (dev >> 4) | where; #else - addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); //seg == 0 + addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16); //seg == 0 #endif outl(0x80000000 | (addr & ~3), 0xCF8); return inb(0xCFC + (addr & 3)); } -#if MMCONF_SUPPORT - uint8_t pci_mmio_rawread_config8(device_t_raw dev, unsigned where) +#if CONFIG_MMCONF_SUPPORT +u8 pci_mmio_rawread_config8(device_t_raw dev, unsigned where) { - unsigned addr; - addr = dev | where; - return read8x(addr); + unsigned addr; + addr = dev | where; + return read8x(addr); } #endif - uint8_t pci_rawread_config8(device_t_raw dev, unsigned where) +u8 pci_rawread_config8(device_t_raw dev, unsigned where) { -#if MMCONF_SUPPORT +#if CONFIG_MMCONF_SUPPORT return pci_mmio_rawread_config8(dev, where); #else return pci_io_rawread_config8(dev, where); #endif } - uint16_t pci_io_rawread_config16(device_t_raw dev, unsigned where) +u16 pci_io_rawread_config16(device_t_raw dev, unsigned where) { unsigned addr; -#if PCI_IO_CFG_EXT == 0 - addr = (dev>>4) | where; +#if CONFIG_PCI_IO_CFG_EXT == 0 + addr = (dev >> 4) | where; #else - addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); + addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16); #endif outl(0x80000000 | (addr & ~3), 0xCF8); return inw(0xCFC + (addr & 2)); } -#if MMCONF_SUPPORT - uint16_t pci_mmio_rawread_config16(device_t_raw dev, unsigned where) +#if CONFIG_MMCONF_SUPPORT +u16 pci_mmio_rawread_config16(device_t_raw dev, unsigned where) { - unsigned addr; - addr = dev | where; - return read16x(addr); + unsigned addr; + addr = dev | where; + return read16x(addr); } #endif - uint16_t pci_rawread_config16(device_t_raw dev, unsigned where) +u16 pci_rawread_config16(device_t_raw dev, unsigned where) { -#if MMCONF_SUPPORT +#if CONFIG_MMCONF_SUPPORT return pci_mmio_rawread_config16(dev, where); #else - return pci_io_rawread_config16(dev, where); + return pci_io_rawread_config16(dev, where); #endif } - - uint32_t pci_io_rawread_config32(device_t_raw dev, unsigned where) +u32 pci_io_rawread_config32(device_t_raw dev, unsigned where) { unsigned addr; -#if PCI_IO_CFG_EXT == 0 - addr = (dev>>4) | where; +#if CONFIG_PCI_IO_CFG_EXT == 0 + addr = (dev >> 4) | where; #else - addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); + addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16); #endif outl(0x80000000 | (addr & ~3), 0xCF8); return inl(0xCFC); } -#if MMCONF_SUPPORT - uint32_t pci_mmio_rawread_config32(device_t_raw dev, unsigned where) +#if CONFIG_MMCONF_SUPPORT +u32 pci_mmio_rawread_config32(device_t_raw dev, unsigned where) { - unsigned addr; - addr = dev | where; - return read32x(addr); + unsigned addr; + addr = dev | where; + return read32x(addr); } #endif - uint32_t pci_rawread_config32(device_t_raw dev, unsigned where) +u32 pci_rawread_config32(device_t_raw dev, unsigned where) { -#if MMCONF_SUPPORT +#if CONFIG_MMCONF_SUPPORT return pci_mmio_rawread_config32(dev, where); #else - return pci_io_rawread_config32(dev, where); + return pci_io_rawread_config32(dev, where); #endif } - void pci_io_rawwrite_config8(device_t_raw dev, unsigned where, uint8_t value) +void pci_io_rawwrite_config8(device_t_raw dev, unsigned where, u8 value) { unsigned addr; -#if PCI_IO_CFG_EXT == 0 - addr = (dev>>4) | where; +#if CONFIG_PCI_IO_CFG_EXT == 0 + addr = (dev >> 4) | where; #else - addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); + addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16); #endif outl(0x80000000 | (addr & ~3), 0xCF8); outb(value, 0xCFC + (addr & 3)); } -#if MMCONF_SUPPORT - void pci_mmio_rawwrite_config8(device_t_raw dev, unsigned where, uint8_t value) +#if CONFIG_MMCONF_SUPPORT +void pci_mmio_rawwrite_config8(device_t_raw dev, unsigned where, u8 value) { - unsigned addr; - addr = dev | where; - write8x(addr, value); + unsigned addr; + addr = dev | where; + write8x(addr, value); } #endif - void pci_rawwrite_config8(device_t_raw dev, unsigned where, uint8_t value) +void pci_rawwrite_config8(device_t_raw dev, unsigned where, u8 value) { -#if MMCONF_SUPPORT +#if CONFIG_MMCONF_SUPPORT pci_mmio_rawwrite_config8(dev, where, value); #else - pci_io_rawwrite_config8(dev, where, value); + pci_io_rawwrite_config8(dev, where, value); #endif } - - void pci_io_rawwrite_config16(device_t_raw dev, unsigned where, uint16_t value) +void pci_io_rawwrite_config16(device_t_raw dev, unsigned where, u16 value) { - unsigned addr; -#if PCI_IO_CFG_EXT == 0 - addr = (dev>>4) | where; + unsigned addr; +#if CONFIG_PCI_IO_CFG_EXT == 0 + addr = (dev >> 4) | where; #else - addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); + addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16); #endif - outl(0x80000000 | (addr & ~3), 0xCF8); - outw(value, 0xCFC + (addr & 2)); + outl(0x80000000 | (addr & ~3), 0xCF8); + outw(value, 0xCFC + (addr & 2)); } -#if MMCONF_SUPPORT - void pci_mmio_rawwrite_config16(device_t_raw dev, unsigned where, uint16_t value) +#if CONFIG_MMCONF_SUPPORT +void pci_mmio_rawwrite_config16(device_t_raw dev, unsigned where, + u16 value) { - unsigned addr; - addr = dev | where; - write16x(addr, value); + unsigned addr; + addr = dev | where; + write16x(addr, value); } #endif - void pci_rawwrite_config16(device_t_raw dev, unsigned where, uint16_t value) +void pci_rawwrite_config16(device_t_raw dev, unsigned where, u16 value) { -#if MMCONF_SUPPORT +#if CONFIG_MMCONF_SUPPORT pci_mmio_rawwrite_config16(dev, where, value); #else pci_io_rawwrite_config16(dev, where, value); #endif } - - void pci_io_rawwrite_config32(device_t_raw dev, unsigned where, uint32_t value) +void pci_io_rawwrite_config32(device_t_raw dev, unsigned where, u32 value) { unsigned addr; -#if PCI_IO_CFG_EXT == 0 - addr = (dev>>4) | where; +#if CONFIG_PCI_IO_CFG_EXT == 0 + addr = (dev >> 4) | where; #else - addr = (dev>>4) | (where & 0xff) | ((where & 0xf00)<<16); + addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16); #endif outl(0x80000000 | (addr & ~3), 0xCF8); outl(value, 0xCFC); } -#if MMCONF_SUPPORT - void pci_mmio_rawwrite_config32(device_t_raw dev, unsigned where, uint32_t value) +#if CONFIG_MMCONF_SUPPORT +void pci_mmio_rawwrite_config32(device_t_raw dev, unsigned where, + u32 value) { - unsigned addr; - addr = dev | where; - write32x(addr, value); + unsigned addr; + addr = dev | where; + write32x(addr, value); } #endif - void pci_rawwrite_config32(device_t_raw dev, unsigned where, uint32_t value) +void pci_rawwrite_config32(device_t_raw dev, unsigned where, u32 value) { -#if MMCONF_SUPPORT +#if CONFIG_MMCONF_SUPPORT pci_mmio_rawwrite_config32(dev, where, value); #else - pci_io_rawwrite_config32(dev, where, value); + pci_io_rawwrite_config32(dev, where, value); #endif } - -void pci_rawmodify_config8(device_t_raw dev, unsigned where, u8 orval,u8 mask) -{ u8 data=pci_rawread_config8(dev,where); - data&=(~mask); - data|=orval; - pci_rawwrite_config8(dev,where,data); +void pci_rawmodify_config8(device_t_raw dev, unsigned where, u8 orval, u8 mask) +{ + u8 data = pci_rawread_config8(dev, where); + data &= (~mask); + data |= orval; + pci_rawwrite_config8(dev, where, data); } -void pci_rawmodify_config16(device_t_raw dev, unsigned where, uint16_t orval,uint16_t mask) -{ uint16_t data=pci_rawread_config16(dev,where); - data&=(~mask); - data|=orval; - pci_rawwrite_config16(dev,where,data); + +void pci_rawmodify_config16(device_t_raw dev, unsigned where, u16 orval, u16 mask) +{ + u16 data = pci_rawread_config16(dev, where); + data &= (~mask); + data |= orval; + pci_rawwrite_config16(dev, where, data); } -void pci_rawmodify_config32(device_t_raw dev, unsigned where, uint32_t orval,uint32_t mask) -{ uint32_t data=pci_rawread_config32(dev,where); - data&=(~mask); - data|=orval; - pci_rawwrite_config32(dev,where,data); + +void pci_rawmodify_config32(device_t_raw dev, unsigned where, u32 orval, u32 mask) +{ + u32 data = pci_rawread_config32(dev, where); + data &= (~mask); + data |= orval; + pci_rawwrite_config32(dev, where, data); } -void io_rawmodify_config8(u16 where, uint8_t orval,uint8_t mask) +void io_rawmodify_config8(u16 where, u8 orval, u8 mask) { - u8 data=inb(where); - data&=(~mask); - data|=orval; - outb(data,where); + u8 data = inb(where); + data &= (~mask); + data |= orval; + outb(data, where); } -void via_pci_inittable(u8 chipversion,struct VIA_PCI_REG_INIT_TABLE* initdata) +void via_pci_inittable(u8 chipversion, + struct VIA_PCI_REG_INIT_TABLE *initdata) { - u8 i=0; + u8 i = 0; device_t_raw devbxdxfx; - for(i=0;;i++) { - if((initdata[i].Mask==0)&&(initdata[i].Value==0)&&(initdata[i].Bus==0)&&(initdata[i].ChipRevisionEnd==0xff)&&(initdata[i].ChipRevisionStart==0)&&(initdata[i].Device==0)&&(initdata[i].Function==0)&&(initdata[i].Register==0)) - break; - if((chipversion>=initdata[i].ChipRevisionStart)&&(chipversion<=initdata[i].ChipRevisionEnd)){ - devbxdxfx=PCI_RAWDEV(initdata[i].Bus,initdata[i].Device,initdata[i].Function); - pci_rawmodify_config8(devbxdxfx, initdata[i].Register,initdata[i].Value,initdata[i].Mask); - } + for (i = 0;; i++) { + if ((initdata[i].Mask == 0) && (initdata[i].Value == 0) + && (initdata[i].Bus == 0) + && (initdata[i].ChipRevisionEnd == 0xff) + && (initdata[i].ChipRevisionStart == 0) + && (initdata[i].Device == 0) + && (initdata[i].Function == 0) + && (initdata[i].Register == 0)) + break; + if ((chipversion >= initdata[i].ChipRevisionStart) + && (chipversion <= initdata[i].ChipRevisionEnd)) { + devbxdxfx = + PCI_RAWDEV(initdata[i].Bus, initdata[i].Device, + initdata[i].Function); + pci_rawmodify_config8(devbxdxfx, + initdata[i].Register, + initdata[i].Value, + initdata[i].Mask); + } } } #endif Modified: trunk/src/northbridge/via/vx800/vx800_ide.c ============================================================================== --- trunk/src/northbridge/via/vx800/vx800_ide.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/northbridge/via/vx800/vx800_ide.c Wed Apr 7 17:40:26 2010 (r5372) @@ -26,7 +26,7 @@ #include <arch/io.h> #include "vx800.h" -static const idedevicepcitable[16 * 12] = { +static const u8 idedevicepcitable[16 * 12] = { /* 0x02, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA8, 0xF0, 0x00, 0x00, 0xB6, Modified: trunk/src/northbridge/via/vx800/vx800_lpc.c ============================================================================== --- trunk/src/northbridge/via/vx800/vx800_lpc.c Wed Apr 7 17:32:52 2010 (r5371) +++ trunk/src/northbridge/via/vx800/vx800_lpc.c Wed Apr 7 17:40:26 2010 (r5372) @@ -104,7 +104,7 @@ printk(BIOS_SPEW, "%s: DONE\n", __FUNCTION__); } -void setup_pm(device_t dev) +static void setup_pm(device_t dev) { u16 tmp; /* Debounce LID and PWRBTN# Inputs for 16ms. */ @@ -198,7 +198,7 @@ */ } -void S3_ps2_kb_ms_wakeup(struct device *dev) +static void S3_ps2_kb_ms_wakeup(struct device *dev) { u8 enables; enables = pci_read_config8(dev, 0x51); @@ -222,12 +222,12 @@ } -void S3_usb_wakeup(struct device *dev) +static void S3_usb_wakeup(struct device *dev) { outw(inw(VX800_ACPI_IO_BASE + 0x22) | 0x4000, VX800_ACPI_IO_BASE + 0x22); //SCI on USB PME } -void S3_lid_wakeup(struct device *dev) +static void S3_lid_wakeup(struct device *dev) { outw(inw(VX800_ACPI_IO_BASE + 0x22) | 0x800, VX800_ACPI_IO_BASE + 0x22); //SCI on LID PME } @@ -301,7 +301,7 @@ /* total kludge to get lxb to call our childrens set/enable functions - these are not called unless this device has a resource to set - so set a dummy one */ -void vx800_read_resources(device_t dev) +static void vx800_read_resources(device_t dev) { struct resource *resource; @@ -312,10 +312,9 @@ IORESOURCE_STORED; resource->size = 2; resource->base = 0x2e; - } -void vx800_set_resources(device_t dev) +static void vx800_set_resources(device_t dev) { struct resource *resource; resource = find_resource(dev, 1); @@ -323,7 +322,7 @@ pci_dev_set_resources(dev); } -void vx800_enable_resources(device_t dev) +static void vx800_enable_resources(device_t dev) { /* vx800 is not a pci bridge and has no resources of its own (other than standard PC i/o addresses). however it does control the isa bus and so

1 0

[commit] r5371 - in trunk/src: northbridge/amd/amdk8 southbridge/amd/amd8111 southbridge/amd/rs780 southbridge/sis/sis966 southbridge/via/k8t890 superio/winbond/w83627hf superio/winbond/w83697hf
by repository service 07 Apr '10

07 Apr '10

Author: stepan Date: Wed Apr 7 17:32:52 2010 New Revision: 5371 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5371 Log: no warnings day Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/northbridge/amd/amdk8/amdk8_f.h trunk/src/northbridge/amd/amdk8/coherent_ht.c trunk/src/northbridge/amd/amdk8/incoherent_ht.c trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c trunk/src/southbridge/amd/amd8111/amd8111_reset.c trunk/src/southbridge/amd/rs780/rs780_early_setup.c trunk/src/southbridge/sis/sis966/sis966_aza.c trunk/src/southbridge/sis/sis966/sis966_early_ctrl.c trunk/src/southbridge/sis/sis966/sis966_early_smbus.c trunk/src/southbridge/sis/sis966/sis966_lpc.c trunk/src/southbridge/sis/sis966/sis966_nic.c trunk/src/southbridge/sis/sis966/sis966_reset.c trunk/src/southbridge/sis/sis966/sis966_usb2.c trunk/src/southbridge/via/k8t890/k8t890_early_car.c trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c trunk/src/superio/winbond/w83697hf/superio.c Modified: trunk/src/northbridge/amd/amdk8/amdk8_f.h ============================================================================== --- trunk/src/northbridge/amd/amdk8/amdk8_f.h Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/northbridge/amd/amdk8/amdk8_f.h Wed Apr 7 17:32:52 2010 (r5371) @@ -522,7 +522,7 @@ #if ((CONFIG_MEM_TRAIN_SEQ != 1) && defined(__PRE_RAM__)) || \ ((CONFIG_MEM_TRAIN_SEQ == 1) && !defined(__PRE_RAM__)) -static void wait_all_core0_mem_trained(struct sys_info *sysinfo) +static inline void wait_all_core0_mem_trained(struct sys_info *sysinfo) { int i; Modified: trunk/src/northbridge/amd/amdk8/coherent_ht.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/coherent_ht.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/northbridge/amd/amdk8/coherent_ht.c Wed Apr 7 17:32:52 2010 (r5371) @@ -153,6 +153,7 @@ } +#if 0 static void enable_apic_ext_id(u8 node) { #if CONFIG_ENABLE_APIC_EXT_ID==1 @@ -165,6 +166,7 @@ pci_write_config32(NODE_HT(node), 0x68, val); #endif } +#endif static void enable_routing(u8 node) { @@ -378,6 +380,7 @@ return byte; } +#if TRY_HIGH_FIRST == 1 static uint8_t get_linkn_last(uint8_t byte) { if(byte & 0x02) { byte &= 0x0f; byte |= 0x00; } @@ -385,7 +388,9 @@ if(byte & 0x08) { byte &= 0x0f; byte |= 0x20; } return byte>>4; } +#endif +#if (CONFIG_MAX_PHYSICAL_CPUS > 2) || (CONFIG_MAX_PHYSICAL_CPUS_4_BUT_MORE_INSTALLED == 1) static uint8_t get_linkn_last_count(uint8_t byte) { byte &= 0x0f; @@ -394,6 +399,7 @@ if(byte & 0x08) { byte &= 0xcf; byte |= 0x20; byte+=0x40; } return byte>>4; } +#endif static void setup_row_local(u8 source, u8 row) /* source will be 7 when it is for temp use*/ { @@ -484,10 +490,12 @@ fill_row(source,7,get_row(source,dest)); } +#if 0 static void clear_temp_row(u8 source) { fill_row(source, 7, DEFAULT); } +#endif static void setup_remote_node(u8 node) { Modified: trunk/src/northbridge/amd/amdk8/incoherent_ht.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/incoherent_ht.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/northbridge/amd/amdk8/incoherent_ht.c Wed Apr 7 17:32:52 2010 (r5371) @@ -67,10 +67,12 @@ return ht_lookup_capability(dev, 0); // Slave/Primary Interface Block Format } +#if 0 static uint8_t ht_lookup_host_capability(device_t dev) { return ht_lookup_capability(dev, 1); // Host/Secondary Interface Block Format } +#endif static void ht_collapse_previous_enumeration(uint8_t bus, unsigned offset_unitid) { Modified: trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c Wed Apr 7 17:32:52 2010 (r5371) @@ -1824,12 +1824,12 @@ int s3_save_nvram_early(u32 dword, int size, int nvram_pos); int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos); #else -int s3_save_nvram_early(u32 dword, int size, int nvram_pos) +static int s3_save_nvram_early(u32 dword, int size, int nvram_pos) { return nvram_pos; } -int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) +static int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) { die("No memory NVRAM loader for DQS data! Unable to restore memory state\n"); @@ -1837,12 +1837,14 @@ } #endif +#if CONFIG_MEM_TRAIN_SEQ == 0 static int save_index_to_pos(unsigned int dev, int size, int index, int nvram_pos) { u32 dword = pci_read_config32_index_wait(dev, 0x98, index); return s3_save_nvram_early(dword, size, nvram_pos); } +#endif static int load_index_to_pos(unsigned int dev, int size, int index, int nvram_pos) { Modified: trunk/src/southbridge/amd/amd8111/amd8111_reset.c ============================================================================== --- trunk/src/southbridge/amd/amd8111/amd8111_reset.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/amd/amd8111/amd8111_reset.c Wed Apr 7 17:32:52 2010 (r5371) @@ -1,4 +1,5 @@ #include <arch/io.h> +#include <reset.h> #include <device/pci_ids.h> #define PCI_DEV(BUS, DEV, FN) ( \ Modified: trunk/src/southbridge/amd/rs780/rs780_early_setup.c ============================================================================== --- trunk/src/southbridge/amd/rs780/rs780_early_setup.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/amd/rs780/rs780_early_setup.c Wed Apr 7 17:32:52 2010 (r5371) @@ -177,6 +177,7 @@ return (cpuid_eax(1) & 0xff00000) != 0; } +#if CONFIG_NORTHBRIDGE_AMD_AMDFAM10 == 1 /* save some spaces */ static u8 l3_cache(void) { return (cpuid_edx(0x80000006) & (0x3FFF << 18)) != 0; @@ -186,6 +187,7 @@ { return (cpuid_ecx(0x80000008) & 0xFF) + 1; } +#endif static u8 get_nb_rev(device_t nb_dev) { Modified: trunk/src/southbridge/sis/sis966/sis966_aza.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_aza.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/sis/sis966/sis966_aza.c Wed Apr 7 17:32:52 2010 (r5371) @@ -32,7 +32,7 @@ #include <delay.h> #include "sis966.h" -uint8_t SiS_SiS7502_init[7][3]={ +u8 SiS_SiS7502_init[7][3]={ {0x04, 0xFF, 0x07}, {0x2C, 0xFF, 0x39}, {0x2D, 0xFF, 0x10}, @@ -42,9 +42,9 @@ {0x00, 0x00, 0x00} //End of table }; -static int set_bits(uint8_t *port, uint32_t mask, uint32_t val) +static int set_bits(u32 port, u32 mask, u32 val) { - uint32_t dword; + u32 dword; int count; val &= mask; @@ -67,11 +67,9 @@ } - uint32_t send_verb(uint8_t *base, uint32_t verb) +static u32 send_verb(u32 base, u32 verb) { - - - uint32_t dword; + u32 dword; dword = read32(base + 0x68); dword=dword|(unsigned long)0x0002; @@ -91,13 +89,12 @@ dword = read32(base + 0x64); return dword; - } -static int codec_detect(uint8_t *base) +static int codec_detect(u32 base) { - uint32_t dword; + u32 dword; int idx=0; /* 1 */ // controller reset @@ -125,7 +122,7 @@ } -static uint32_t verb_data[] = { +static u32 verb_data[] = { //14 0x01471c10, @@ -189,18 +186,18 @@ 0x01f71f01, }; -static unsigned find_verb(uint32_t viddid, uint32_t **verb) +static unsigned find_verb(u32 viddid, u32 **verb) { if((viddid == 0x10ec0883) || (viddid == 0x10ec0882) || (viddid == 0x10ec0880)) return 0; - *verb = (uint32_t *)verb_data; - return sizeof(verb_data)/sizeof(uint32_t); + *verb = (u32 *)verb_data; + return sizeof(verb_data)/sizeof(u32); } -static void codec_init(uint8_t *base, int addr) +static void codec_init(u32 base, int addr) { - uint32_t dword; - uint32_t *verb; + u32 dword; + u32 *verb; unsigned verb_size; int i; @@ -235,7 +232,7 @@ printk(BIOS_DEBUG, "verb loaded!\n"); } -static void codecs_init(uint8_t *base, uint32_t codec_mask) +static void codecs_init(u32 base, u32 codec_mask) { codec_init(base, 0); return; @@ -243,15 +240,15 @@ static void aza_init(struct device *dev) { - uint8_t *base; + u32 base; struct resource *res; - uint32_t codec_mask; + u32 codec_mask; print_debug("AZALIA_INIT:---------->\n"); //-------------- enable AZA (SiS7502) ------------------------- { - uint8_t temp8; + u8 temp8; int i=0; while(SiS_SiS7502_init[i][0] != 0) { @@ -292,8 +289,8 @@ if(!res) return; - base =(uint8_t *) res->base; - printk(BIOS_DEBUG, "base = %p\n", base); + base = res->base; + printk(BIOS_DEBUG, "base = 0x%08x\n", base); codec_mask = codec_detect(base); Modified: trunk/src/southbridge/sis/sis966/sis966_early_ctrl.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_early_ctrl.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/sis/sis966/sis966_early_ctrl.c Wed Apr 7 17:32:52 2010 (r5371) @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <reset.h> + static unsigned get_sbdn(unsigned bus) { device_t dev; @@ -31,7 +33,7 @@ return (dev>>15) & 0x1f; } -static void hard_reset(void) +void hard_reset(void) { set_bios_reset(); @@ -42,12 +44,11 @@ static void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn) { -/* default value for sis966 is good */ + /* default value for sis966 is good */ /* set VFSMAF ( VID/FID System Management Action Field) to 2 */ - } -static void soft_reset(void) +void soft_reset(void) { set_bios_reset(); Modified: trunk/src/southbridge/sis/sis966/sis966_early_smbus.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_early_smbus.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/sis/sis966/sis966_early_smbus.c Wed Apr 7 17:32:52 2010 (r5371) @@ -344,7 +344,7 @@ => 04h : 128MBytes => Others: Reserved */ -void Init_Share_Memory(uint8_t ShareSize) +static void Init_Share_Memory(uint8_t ShareSize) { device_t dev; @@ -360,7 +360,7 @@ => 04h : 512MBytes => Others: Reserved */ -void Init_Aper_Size(uint8_t AperSize) +static void Init_Aper_Size(uint8_t AperSize) { device_t dev; uint16_t SiSAperSizeTable[]={0x0F38, 0x0F30, 0x0F20, 0x0F00, 0x0E00}; @@ -372,7 +372,7 @@ pci_write_config16(dev, 0xB4, SiSAperSizeTable[AperSize]); } -void sis_init_stage1(void) +static void sis_init_stage1(void) { device_t dev; uint8_t temp8; @@ -434,7 +434,7 @@ -void sis_init_stage2(void) +static void sis_init_stage2(void) { device_t dev; msr_t msr; Modified: trunk/src/southbridge/sis/sis966/sis966_lpc.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_lpc.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/sis/sis966/sis966_lpc.c Wed Apr 7 17:32:52 2010 (r5371) @@ -55,6 +55,8 @@ #define CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL MAINBOARD_POWER_ON #endif +#undef SLAVE_INIT + static void lpc_common_init(device_t dev) { uint8_t byte; @@ -69,11 +71,12 @@ setup_ioapic(ioapic_base, 0); // Don't rename IO APIC ID } +#ifdef SLAVE_INIT static void lpc_slave_init(device_t dev) { lpc_common_init(dev); } - +#endif static void lpc_usb_legacy_init(device_t dev) { @@ -271,12 +274,14 @@ // .enable = sis966_enable, .ops_pci = &lops_pci, }; + static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, .vendor = PCI_VENDOR_ID_SIS, .device = PCI_DEVICE_ID_SIS_SIS966_LPC, }; +#ifdef SLAVE_INIT // No device? static struct device_operations lpc_slave_ops = { .read_resources = sis966_lpc_read_resources, .set_resources = pci_dev_set_resources, @@ -285,3 +290,4 @@ // .enable = sis966_enable, .ops_pci = &lops_pci, }; +#endif Modified: trunk/src/southbridge/sis/sis966/sis966_nic.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_nic.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/sis/sis966/sis966_nic.c Wed Apr 7 17:32:52 2010 (r5371) @@ -34,7 +34,7 @@ #include "sis966.h" -uint8_t SiS_SiS191_init[6][3]={ +u8 SiS_SiS191_init[6][3]={ {0x04, 0xFF, 0x07}, {0x2C, 0xFF, 0x39}, {0x2D, 0xFF, 0x10}, @@ -50,17 +50,18 @@ #define TRUE 1 #define FALSE 0 -uint16_t MacAddr[3]; +u16 MacAddr[3]; -void writeApcByte(int addr, uint8_t value) +static void writeApcByte(int addr, u8 value) { outb(addr,0x78); outb(value,0x79); } -uint8_t readApcByte(int addr) + +static u8 readApcByte(int addr) { - uint8_t value; + u8 value; outb(addr,0x78); value=inb(0x79); return(value); @@ -68,7 +69,7 @@ static void readApcMacAddr(void) { - uint8_t i; + u8 i; // enable APC in south bridge sis966 D2F0 @@ -93,9 +94,9 @@ static void set_apc(struct device *dev) { - uint16_t addr; - uint16_t i; - uint8_t bTmp; + u16 addr; + u16 i; + u8 bTmp; /* enable APC in south bridge sis966 D2F0 */ outl(0x80001048,0xcf8); @@ -104,8 +105,8 @@ for(i = 0 ; i <3; i++) { addr=0x9+2*i; - writeApcByte(addr,(uint8_t)(MacAddr[i]&0xFF)); - writeApcByte(addr+1L,(uint8_t)((MacAddr[i]>>8)&0xFF)); + writeApcByte(addr,(u8)(MacAddr[i]&0xFF)); + writeApcByte(addr+1L,(u8)((MacAddr[i]>>8)&0xFF)); // printf("%x - ",readMacAddrByte(0x59+i)); } @@ -135,11 +136,11 @@ // Contents of EEPROM word (Reg). //----------------------------------------------------------------------------- #define LoopNum 200 -static unsigned long ReadEEprom( struct device *dev, uint32_t base, uint32_t Reg) +static unsigned long ReadEEprom( struct device *dev, u32 base, u32 Reg) { - uint32_t data; - uint32_t i; - uint32_t ulValue; + u32 data; + u32 i; + u32 ulValue; ulValue = (0x80 | (0x2 << 8) | (Reg << 10)); //BIT_7 @@ -169,11 +170,11 @@ return data; } -static int phy_read(uint32_t base, unsigned phy_addr, unsigned phy_reg) +static int phy_read(u32 base, unsigned phy_addr, unsigned phy_reg) { - uint32_t ulValue; - uint32_t Read_Cmd; - uint16_t usData; + u32 ulValue; + u32 Read_Cmd; + u16 usData; @@ -203,10 +204,10 @@ // Detect a valid PHY // If there exist a valid PHY then return TRUE, else return FALSE -static int phy_detect(uint32_t base,uint16_t *PhyAddr) //BOOL PHY_Detect() +static int phy_detect(u32 base,u16 *PhyAddr) //BOOL PHY_Detect() { int bFoundPhy = FALSE; - uint16_t usData; + u16 usData; int PhyAddress = 0; @@ -239,17 +240,15 @@ static void nic_init(struct device *dev) { int val; - uint16_t PhyAddr; - uint32_t base; + u16 PhyAddr; + u32 base; struct resource *res; - print_debug("NIC_INIT:---------->\n"); - //-------------- enable NIC (SiS19x) ------------------------- { - uint8_t temp8; + u8 temp8; int i=0; while(SiS_SiS191_init[i][0] != 0) { Modified: trunk/src/southbridge/sis/sis966/sis966_reset.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_reset.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/sis/sis966/sis966_reset.c Wed Apr 7 17:32:52 2010 (r5371) @@ -22,6 +22,7 @@ */ #include <arch/io.h> +#include <reset.h> #define PCI_DEV(BUS, DEV, FN) ( \ (((BUS) & 0xFFF) << 20) | \ Modified: trunk/src/southbridge/sis/sis966/sis966_usb2.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_usb2.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/sis/sis966/sis966_usb2.c Wed Apr 7 17:32:52 2010 (r5371) @@ -36,7 +36,7 @@ extern struct ehci_debug_info dbg_info; -uint8_t SiS_SiS7002_init[22][3]={ +u8 SiS_SiS7002_init[22][3]={ {0x04, 0x00, 0x06}, {0x0D, 0x00, 0x00}, @@ -70,14 +70,14 @@ static void usb2_init(struct device *dev) { - uint8_t *base; + u32 base; struct resource *res; print_debug("USB 2.0 INIT:---------->\n"); //-------------- enable USB2.0 (SiS7002) ------------------------- { - uint8_t temp8; + u8 temp8; int i=0; while(SiS_SiS7002_init[i][0] != 0) @@ -94,8 +94,8 @@ if(!res) return; - base =(uint8_t *) res->base; - printk(BIOS_DEBUG, "base = %p\n", base); + base = res->base; + printk(BIOS_DEBUG, "base = 0x%08x\n", base); write32(base+0x20, 0x2); //----------------------------------------------------------- Modified: trunk/src/southbridge/via/k8t890/k8t890_early_car.c ============================================================================== --- trunk/src/southbridge/via/k8t890/k8t890_early_car.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/southbridge/via/k8t890/k8t890_early_car.c Wed Apr 7 17:32:52 2010 (r5371) @@ -113,7 +113,8 @@ return 1; } -int s3_save_nvram_early(u32 dword, int size, int nvram_pos) { +int s3_save_nvram_early(u32 dword, int size, int nvram_pos) +{ printk(BIOS_DEBUG, "Writing %x of size %d to nvram pos: %d\n", dword, size, nvram_pos); switch (size) { @@ -133,7 +134,8 @@ return nvram_pos; } -int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) { +int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) +{ switch (size) { case 1: *old_dword &= ~0xff; Modified: trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c ============================================================================== --- trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c Wed Apr 7 17:32:52 2010 (r5371) @@ -47,7 +47,7 @@ pnp_exit_ext_func_mode(dev); } -static void w83627hf_set_clksel_48(device_t dev) +static inline void w83627hf_set_clksel_48(device_t dev) { unsigned port = dev >> 8; pnp_enter_ext_func_mode(dev); Modified: trunk/src/superio/winbond/w83697hf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83697hf/superio.c Wed Apr 7 17:30:11 2010 (r5370) +++ trunk/src/superio/winbond/w83697hf/superio.c Wed Apr 7 17:32:52 2010 (r5371) @@ -44,7 +44,7 @@ static void w83697hf_init(device_t dev) { struct superio_winbond_w83697hf_config *conf; - struct resource *res0, *res1; + struct resource *res0; if (!dev->enabled) return;

1 0

[commit] r5370 - in trunk/src: include/cpu/amd mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 mainboard/amd/pistachio mainboard/amd/serengeti_cheetah mainboard/amd/sereng...
by repository service 07 Apr '10

07 Apr '10

Author: stepan Date: Wed Apr 7 17:30:11 2010 New Revision: 5370 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5370 Log: move amd K8/Fam10 "bus detection" function prototypes to a common place. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/include/cpu/amd/amdfam10_sysconf.h trunk/src/include/cpu/amd/amdk8_sysconf.h trunk/src/mainboard/amd/dbm690t/acpi_tables.c trunk/src/mainboard/amd/dbm690t/get_bus_conf.c trunk/src/mainboard/amd/dbm690t/irq_tables.c trunk/src/mainboard/amd/dbm690t/mptable.c trunk/src/mainboard/amd/mahogany/acpi_tables.c trunk/src/mainboard/amd/mahogany/get_bus_conf.c trunk/src/mainboard/amd/mahogany/irq_tables.c trunk/src/mainboard/amd/mahogany/mptable.c trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c trunk/src/mainboard/amd/mahogany_fam10/irq_tables.c trunk/src/mainboard/amd/mahogany_fam10/mptable.c trunk/src/mainboard/amd/pistachio/acpi_tables.c trunk/src/mainboard/amd/pistachio/get_bus_conf.c trunk/src/mainboard/amd/pistachio/irq_tables.c trunk/src/mainboard/amd/pistachio/mptable.c trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c trunk/src/mainboard/amd/serengeti_cheetah/irq_tables.c trunk/src/mainboard/amd/serengeti_cheetah/mptable.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c trunk/src/mainboard/asrock/939a785gmh/get_bus_conf.c trunk/src/mainboard/asrock/939a785gmh/irq_tables.c trunk/src/mainboard/asrock/939a785gmh/mptable.c trunk/src/mainboard/asus/a8n_e/get_bus_conf.c trunk/src/mainboard/asus/a8n_e/irq_tables.c trunk/src/mainboard/asus/a8n_e/mptable.c trunk/src/mainboard/broadcom/blast/get_bus_conf.c trunk/src/mainboard/broadcom/blast/irq_tables.c trunk/src/mainboard/broadcom/blast/mptable.c trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c trunk/src/mainboard/gigabyte/m57sli/irq_tables.c trunk/src/mainboard/gigabyte/m57sli/mptable.c trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c trunk/src/mainboard/hp/dl145_g3/mptable.c trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c trunk/src/mainboard/iwill/dk8_htx/irq_tables.c trunk/src/mainboard/iwill/dk8_htx/mptable.c trunk/src/mainboard/kontron/kt690/acpi_tables.c trunk/src/mainboard/kontron/kt690/get_bus_conf.c trunk/src/mainboard/kontron/kt690/irq_tables.c trunk/src/mainboard/kontron/kt690/mptable.c trunk/src/mainboard/msi/ms7135/get_bus_conf.c trunk/src/mainboard/msi/ms7135/irq_tables.c trunk/src/mainboard/msi/ms7135/mptable.c trunk/src/mainboard/msi/ms7260/get_bus_conf.c trunk/src/mainboard/msi/ms7260/irq_tables.c trunk/src/mainboard/msi/ms7260/mptable.c trunk/src/mainboard/msi/ms9185/get_bus_conf.c trunk/src/mainboard/msi/ms9185/irq_tables.c trunk/src/mainboard/msi/ms9185/mptable.c trunk/src/mainboard/msi/ms9282/get_bus_conf.c trunk/src/mainboard/msi/ms9282/irq_tables.c trunk/src/mainboard/msi/ms9282/mptable.c trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c trunk/src/mainboard/msi/ms9652_fam10/mptable.c trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c trunk/src/mainboard/nvidia/l1_2pvv/mptable.c trunk/src/mainboard/sunw/ultra40/get_bus_conf.c trunk/src/mainboard/sunw/ultra40/irq_tables.c trunk/src/mainboard/sunw/ultra40/mptable.c trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c trunk/src/mainboard/supermicro/h8dme/irq_tables.c trunk/src/mainboard/supermicro/h8dme/mptable.c trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c trunk/src/mainboard/supermicro/h8dmr/irq_tables.c trunk/src/mainboard/supermicro/h8dmr/mptable.c trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c trunk/src/mainboard/technexion/tim5690/acpi_tables.c trunk/src/mainboard/technexion/tim5690/get_bus_conf.c trunk/src/mainboard/technexion/tim5690/irq_tables.c trunk/src/mainboard/technexion/tim5690/mptable.c trunk/src/mainboard/technexion/tim8690/acpi_tables.c trunk/src/mainboard/technexion/tim8690/get_bus_conf.c trunk/src/mainboard/technexion/tim8690/irq_tables.c trunk/src/mainboard/technexion/tim8690/mptable.c trunk/src/mainboard/tyan/s2881/get_bus_conf.c trunk/src/mainboard/tyan/s2881/irq_tables.c trunk/src/mainboard/tyan/s2881/mptable.c trunk/src/mainboard/tyan/s2885/get_bus_conf.c trunk/src/mainboard/tyan/s2885/irq_tables.c trunk/src/mainboard/tyan/s2885/mptable.c trunk/src/mainboard/tyan/s2891/get_bus_conf.c trunk/src/mainboard/tyan/s2891/irq_tables.c trunk/src/mainboard/tyan/s2891/mptable.c trunk/src/mainboard/tyan/s2892/get_bus_conf.c trunk/src/mainboard/tyan/s2892/irq_tables.c trunk/src/mainboard/tyan/s2892/mptable.c trunk/src/mainboard/tyan/s2895/get_bus_conf.c trunk/src/mainboard/tyan/s2895/irq_tables.c trunk/src/mainboard/tyan/s2895/mptable.c trunk/src/mainboard/tyan/s2912/get_bus_conf.c trunk/src/mainboard/tyan/s2912/irq_tables.c trunk/src/mainboard/tyan/s2912/mptable.c trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c trunk/src/mainboard/tyan/s2912_fam10/mptable.c Modified: trunk/src/include/cpu/amd/amdfam10_sysconf.h ============================================================================== --- trunk/src/include/cpu/amd/amdfam10_sysconf.h Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/include/cpu/amd/amdfam10_sysconf.h Wed Apr 7 17:30:11 2010 (r5370) @@ -70,4 +70,6 @@ extern struct amdfam10_sysconf_t sysconf; +void get_sblk_pci1234(void); +void get_bus_conf(void); #endif Modified: trunk/src/include/cpu/amd/amdk8_sysconf.h ============================================================================== --- trunk/src/include/cpu/amd/amdk8_sysconf.h Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/include/cpu/amd/amdk8_sysconf.h Wed Apr 7 17:30:11 2010 (r5370) @@ -25,4 +25,6 @@ extern struct amdk8_sysconf_t sysconf; +void get_sblk_pci1234(void); +void get_bus_conf(void); #endif Modified: trunk/src/mainboard/amd/dbm690t/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -92,7 +92,7 @@ return current; } -extern void get_bus_conf(void); + static void update_ssdtx(void *ssdtx, int i) { Modified: trunk/src/mainboard/amd/dbm690t/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/dbm690t/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -59,7 +59,7 @@ u32 sbdn_rs690; u32 sbdn_sb600; -extern void get_sblk_pci1234(void); + static u32 get_bus_conf_done = 0; Modified: trunk/src/mainboard/amd/dbm690t/irq_tables.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/dbm690t/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/amd/dbm690t/mptable.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/dbm690t/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -36,7 +36,7 @@ extern u32 sbdn_rs690; extern u32 sbdn_sb600; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/amd/mahogany/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -99,7 +99,7 @@ return current; } -extern void get_bus_conf(void); + #if CONFIG_ACPI_SSDTX_NUM >= 1 static void update_ssdtx(void *ssdtx, int i) Modified: trunk/src/mainboard/amd/mahogany/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/mahogany/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -59,7 +59,7 @@ u32 sbdn_rs780; u32 sbdn_sb700; -extern void get_sblk_pci1234(void); + static u32 get_bus_conf_done = 0; Modified: trunk/src/mainboard/amd/mahogany/irq_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/mahogany/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/amd/mahogany/mptable.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/mahogany/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -37,7 +37,7 @@ extern u32 sbdn_rs780; extern u32 sbdn_sb700; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -89,7 +89,7 @@ return current; } -extern void get_bus_conf(void); + extern void update_ssdt(void *ssdt); /* not tested yet. */ Modified: trunk/src/mainboard/amd/mahogany_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/mahogany_fam10/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -25,7 +25,7 @@ #include <cpu/amd/amdfam10_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/amd/mahogany_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/mahogany_fam10/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -37,7 +37,7 @@ extern u32 sbdn_rs780; extern u32 sbdn_sb700; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/amd/pistachio/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -92,7 +92,7 @@ return current; } -extern void get_bus_conf(void); + static void update_ssdtx(void *ssdtx, int i) { Modified: trunk/src/mainboard/amd/pistachio/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/pistachio/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -59,7 +59,7 @@ u32 sbdn_rs690; u32 sbdn_sb600; -extern void get_sblk_pci1234(void); + static u32 get_bus_conf_done = 0; Modified: trunk/src/mainboard/amd/pistachio/irq_tables.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/pistachio/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/amd/pistachio/mptable.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/pistachio/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -36,7 +36,7 @@ extern u32 sbdn_rs690; extern u32 sbdn_sb600; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -150,7 +150,7 @@ return current; } -extern void get_bus_conf(void); + static void update_ssdtx(void *ssdtx, int i) { Modified: trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -39,7 +39,7 @@ // 0x20202020, }; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/amd/serengeti_cheetah/irq_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/serengeti_cheetah/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -34,7 +34,7 @@ } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/amd/serengeti_cheetah/mptable.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/serengeti_cheetah/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -10,7 +10,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -160,7 +160,7 @@ return current; } -extern void get_bus_conf(void); + extern void update_ssdt(void *ssdt); static void update_ssdtx(void *ssdtx, int i) Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -46,7 +46,7 @@ } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -29,7 +29,7 @@ #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -99,7 +99,7 @@ return current; } -extern void get_bus_conf(void); + #if CONFIG_ACPI_SSDTX_NUM >= 1 static void update_ssdtx(void *ssdtx, int i) Modified: trunk/src/mainboard/asrock/939a785gmh/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/asrock/939a785gmh/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -59,7 +59,7 @@ u32 sbdn_rs780; u32 sbdn_sb700; -extern void get_sblk_pci1234(void); + static u32 get_bus_conf_done = 0; Modified: trunk/src/mainboard/asrock/939a785gmh/irq_tables.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/asrock/939a785gmh/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/asrock/939a785gmh/mptable.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/asrock/939a785gmh/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -37,7 +37,7 @@ extern u32 sbdn_rs780; extern u32 sbdn_sb700; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/asus/a8n_e/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/asus/a8n_e/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -61,7 +61,7 @@ unsigned bus_type[256]; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/asus/a8n_e/irq_tables.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/asus/a8n_e/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -30,7 +30,7 @@ extern unsigned char bus_isa; extern unsigned char bus_ck804[6]; -extern void get_bus_conf(void); + /** * Add one line to IRQ table. Modified: trunk/src/mainboard/asus/a8n_e/mptable.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/asus/a8n_e/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -32,7 +32,7 @@ extern unsigned char bus_ck804[6]; extern unsigned apicid_ck804; extern unsigned bus_type[256]; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/broadcom/blast/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/broadcom/blast/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -46,7 +46,7 @@ }; unsigned sbdn2; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/broadcom/blast/irq_tables.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/broadcom/blast/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -40,7 +40,7 @@ extern unsigned sbdn2; -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/broadcom/blast/mptable.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/broadcom/blast/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -19,7 +19,7 @@ extern unsigned sbdn2; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -66,7 +66,7 @@ }; unsigned bus_type[256]; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -55,7 +55,7 @@ extern unsigned char bus_isa; extern unsigned char bus_sis966[8]; //1 -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { @@ -133,7 +133,6 @@ PINTH = IRQ7 */ - int i; uint8_t reg[8]={0x41,0x42,0x43,0x44,0x60,0x61,0x62,0x63}; uint8_t irq[8]={0x0A,0X0B,0X0,0X0a,0X0B,0X05,0X0,0X07}; Modified: trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -47,7 +47,7 @@ unsigned int gsi_base = 0x18; extern unsigned char bus_mcp55[8]; extern unsigned apicid_mcp55; - extern void get_bus_conf(void); + unsigned sbdn; struct resource *res; device_t dev; Modified: trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -64,7 +64,7 @@ }; unsigned bus_type[256]; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/gigabyte/m57sli/irq_tables.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/gigabyte/m57sli/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -53,7 +53,7 @@ extern unsigned char bus_isa; extern unsigned char bus_mcp55[8]; //1 -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/gigabyte/m57sli/mptable.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/gigabyte/m57sli/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -34,7 +34,7 @@ extern unsigned bus_type[256]; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -61,7 +61,7 @@ // 0x20202020, }; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/hp/dl145_g3/mptable.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/hp/dl145_g3/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -41,7 +41,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -157,7 +157,7 @@ return current; } -extern void get_bus_conf(void); + static void update_ssdtx(void *ssdtx, int i) { Modified: trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -39,7 +39,7 @@ // 0x20202020, }; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/iwill/dk8_htx/irq_tables.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/iwill/dk8_htx/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -34,7 +34,7 @@ } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/iwill/dk8_htx/mptable.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/iwill/dk8_htx/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -10,7 +10,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/kontron/kt690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -92,7 +92,7 @@ return current; } -extern void get_bus_conf(void); + static void update_ssdtx(void *ssdtx, int i) { Modified: trunk/src/mainboard/kontron/kt690/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/kontron/kt690/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -59,7 +59,7 @@ u32 sbdn_rs690; u32 sbdn_sb600; -extern void get_sblk_pci1234(void); + static u32 get_bus_conf_done = 0; Modified: trunk/src/mainboard/kontron/kt690/irq_tables.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/kontron/kt690/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/kontron/kt690/mptable.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/kontron/kt690/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -36,7 +36,7 @@ extern u32 sbdn_rs690; extern u32 sbdn_sb600; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/msi/ms7135/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms7135/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -51,7 +51,7 @@ }; unsigned bus_type[256]; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/msi/ms7135/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms7135/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -37,7 +37,7 @@ extern unsigned char bus_isa; extern unsigned char bus_ck804[6]; -extern void get_bus_conf(void); + /** * Add one line to IRQ table. Modified: trunk/src/mainboard/msi/ms7135/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms7135/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -36,7 +36,7 @@ extern unsigned bus_type[256]; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/msi/ms7260/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms7260/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -67,7 +67,7 @@ unsigned bus_type[256]; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/msi/ms7260/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms7260/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -49,7 +49,7 @@ extern unsigned char bus_isa; extern unsigned char bus_mcp55[8]; // 1 -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/msi/ms7260/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms7260/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ extern unsigned apicid_mcp55; extern unsigned bus_type[256]; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/msi/ms9185/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9185/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -62,7 +62,7 @@ // 0x20202020, }; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/msi/ms9185/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9185/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -58,7 +58,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/msi/ms9185/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9185/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -38,7 +38,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/msi/ms9282/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9282/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -64,7 +64,7 @@ }; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/msi/ms9282/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9282/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -55,7 +55,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/msi/ms9282/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9282/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -32,7 +32,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -49,7 +49,7 @@ struct mb_sysconf_t *m; //extern unsigned char bus_mcp55[8]; //extern unsigned apicid_mcp55; - extern void get_bus_conf(void); + unsigned sbdn; struct resource *res; device_t dev; Modified: trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -52,7 +52,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/msi/ms9652_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/msi/ms9652_fam10/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -29,7 +29,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -61,7 +61,7 @@ }; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -52,7 +52,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/nvidia/l1_2pvv/mptable.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/nvidia/l1_2pvv/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -29,7 +29,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/sunw/ultra40/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/sunw/ultra40/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -61,7 +61,7 @@ unsigned sbdn3; unsigned sbdnb; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/sunw/ultra40/irq_tables.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/sunw/ultra40/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -51,7 +51,7 @@ extern unsigned sbdn3; extern unsigned sbdnb; -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/sunw/ultra40/mptable.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/sunw/ultra40/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -32,7 +32,7 @@ extern unsigned sbdn3; extern unsigned sbdnb; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -65,7 +65,7 @@ }; unsigned sbdnb; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/supermicro/h8dme/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dme/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -53,7 +53,7 @@ extern unsigned char bus_isa; extern unsigned char bus_mcp55[8]; //1 -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/supermicro/h8dme/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dme/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -33,7 +33,7 @@ extern unsigned char bus_pcix[3]; // under bus_mcp55_2 -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -65,7 +65,7 @@ }; unsigned sbdnb; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/supermicro/h8dmr/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dmr/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -53,7 +53,7 @@ extern unsigned char bus_isa; extern unsigned char bus_mcp55[8]; //1 -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/supermicro/h8dmr/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dmr/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -33,7 +33,7 @@ extern unsigned char bus_pcix[3]; // under bus_mcp55_2 -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -52,7 +52,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -29,7 +29,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -52,7 +52,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -29,7 +29,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + extern unsigned sbdn3; static void *smp_write_config_table(void *v) Modified: trunk/src/mainboard/technexion/tim5690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -92,7 +92,7 @@ return current; } -extern void get_bus_conf(void); + static void update_ssdtx(void *ssdtx, int i) { Modified: trunk/src/mainboard/technexion/tim5690/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim5690/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -59,7 +59,7 @@ u32 sbdn_rs690; u32 sbdn_sb600; -extern void get_sblk_pci1234(void); + static u32 get_bus_conf_done = 0; Modified: trunk/src/mainboard/technexion/tim5690/irq_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim5690/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/technexion/tim5690/mptable.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim5690/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -36,7 +36,7 @@ extern u32 sbdn_rs690; extern u32 sbdn_sb600; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/technexion/tim8690/acpi_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -92,7 +92,7 @@ return current; } -extern void get_bus_conf(void); + static void update_ssdtx(void *ssdtx, int i) { Modified: trunk/src/mainboard/technexion/tim8690/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim8690/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -59,7 +59,7 @@ u32 sbdn_rs690; u32 sbdn_sb600; -extern void get_sblk_pci1234(void); + static u32 get_bus_conf_done = 0; Modified: trunk/src/mainboard/technexion/tim8690/irq_tables.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim8690/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> -extern void get_bus_conf(void); + static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 link0, u16 bitmap0, u8 link1, u16 bitmap1, Modified: trunk/src/mainboard/technexion/tim8690/mptable.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/technexion/tim8690/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -36,7 +36,7 @@ extern u32 sbdn_rs690; extern u32 sbdn_sb600; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/tyan/s2881/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2881/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -48,7 +48,7 @@ }; unsigned sbdn3; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/tyan/s2881/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2881/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -38,7 +38,7 @@ extern unsigned sbdn3; -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/tyan/s2881/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2881/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -18,7 +18,7 @@ extern unsigned sbdn3; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/tyan/s2885/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2885/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -50,7 +50,7 @@ unsigned sbdn3; unsigned sbdn5; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/tyan/s2885/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2885/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -41,7 +41,7 @@ extern unsigned sbdn3; extern unsigned sbdn5; -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/tyan/s2885/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2885/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -21,7 +21,7 @@ extern unsigned sbdn3; extern unsigned sbdn5; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) Modified: trunk/src/mainboard/tyan/s2891/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2891/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -55,7 +55,7 @@ unsigned sbdn3; unsigned coprocdn; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/tyan/s2891/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2891/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -45,7 +45,7 @@ extern unsigned sbdn3; extern unsigned coprocdn; -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/tyan/s2891/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2891/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -22,7 +22,7 @@ extern unsigned sbdn3; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/tyan/s2892/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2892/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -52,7 +52,7 @@ unsigned sbdn3; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/tyan/s2892/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2892/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -43,7 +43,7 @@ extern unsigned sbdn3; -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/tyan/s2892/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2892/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -22,7 +22,7 @@ extern unsigned sbdn3; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/tyan/s2895/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2895/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -60,7 +60,7 @@ unsigned sbdn3; unsigned sbdnb; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/tyan/s2895/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2895/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -50,7 +50,7 @@ extern unsigned sbdn3; extern unsigned sbdnb; -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/tyan/s2895/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2895/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -30,7 +30,7 @@ extern unsigned sbdn3; extern unsigned sbdnb; -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/tyan/s2912/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/get_bus_conf.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2912/get_bus_conf.c Wed Apr 7 17:30:11 2010 (r5370) @@ -61,7 +61,7 @@ }; -extern void get_sblk_pci1234(void); + static unsigned get_bus_conf_done = 0; Modified: trunk/src/mainboard/tyan/s2912/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2912/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -52,7 +52,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/tyan/s2912/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2912/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -29,7 +29,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) { Modified: trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c Wed Apr 7 17:30:11 2010 (r5370) @@ -52,7 +52,7 @@ pirq_info->rfu = rfu; } -extern void get_bus_conf(void); + unsigned long write_pirq_routing_table(unsigned long addr) { Modified: trunk/src/mainboard/tyan/s2912_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/mptable.c Wed Apr 7 05:41:39 2010 (r5369) +++ trunk/src/mainboard/tyan/s2912_fam10/mptable.c Wed Apr 7 17:30:11 2010 (r5370) @@ -29,7 +29,7 @@ #include "mb_sysconf.h" -extern void get_bus_conf(void); + static void *smp_write_config_table(void *v) {

1 0

Re: [coreboot] Need confirmation if HP nx6310 will work with coreboot
by secretocean＠gmx.de 07 Apr '10

07 Apr '10

Hi, oh shit, I thought it would be sufficient to rewrite the flash chip on the board by flashrom! Why this effort? -- GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT! Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01

2 1

build service results for r5369
by coreboot information 07 Apr '10

07 Apr '10

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 5369 to the coreboot repository. This caused the following changes: Change Log: it's a long term, give the compiler a chance to breathe .. ;-) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Build Log: Compilation of via:epia has been fixed If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot April 2010