mail.coreboot.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
January
2000
December
November
October
September
August
July
June
May
April
March
February
January
1999
December
November
October
September
August
July
June
May
April
March
February
January
1998
December
November
October
September
August
July
June
May
April
March
February
January
1997
December
November
October
September
August
July
June
May
April
March
February
January
1996
December
November
October
September
August
July
June
May
April
March
February
January
1995
December
November
October
September
August
July
June
May
April
March
February
January
1994
December
November
October
September
August
July
June
May
April
March
February
January
1993
December
November
October
September
August
July
June
May
April
March
February
January
1992
December
November
October
September
August
July
June
May
April
March
February
January
1991
December
November
October
September
August
July
June
May
April
March
February
January
1990
December
November
October
September
August
July
June
May
April
March
February
January
1989
December
November
October
September
August
July
June
May
April
March
February
January
1988
December
November
October
September
August
July
June
May
April
March
February
January
1987
December
November
October
September
August
July
June
May
April
March
February
January
1986
December
November
October
September
August
July
June
May
April
March
February
January
1985
December
November
October
September
August
July
June
May
April
March
February
January
1984
December
November
October
September
August
July
June
May
April
March
February
January
1983
December
November
October
September
August
July
June
May
April
March
February
January
1982
December
November
October
September
August
July
June
May
April
March
February
January
1981
December
November
October
September
August
July
June
May
April
March
February
January
1980
December
November
October
September
August
July
June
May
April
March
February
January
1979
December
November
October
September
August
July
June
May
April
March
February
January
1978
December
November
October
September
August
July
June
May
April
March
February
January
1977
December
November
October
September
August
July
June
May
April
March
February
January
1976
December
November
October
September
August
July
June
May
April
March
February
January
1975
December
November
October
September
August
July
June
May
April
March
February
January
1974
December
November
October
September
August
July
June
May
April
March
February
January
1973
December
November
October
September
August
July
June
May
April
March
February
January
1972
December
November
October
September
August
July
June
May
April
March
February
January
1971
December
November
October
September
August
July
June
May
April
March
February
January
1970
December
November
October
September
August
July
June
May
April
March
February
January
1969
December
November
October
September
August
July
June
May
April
March
February
January
1968
December
November
October
September
August
July
June
May
April
March
February
January
1967
December
November
October
September
August
July
June
May
April
March
February
January
1966
December
November
October
September
August
July
June
May
April
March
February
January
1965
December
November
October
September
August
July
June
May
April
March
February
January
1964
December
November
October
September
August
July
June
May
April
March
February
January
1963
December
November
October
September
August
July
June
May
April
March
February
January
1962
December
November
October
September
August
July
June
May
April
March
February
January
1961
December
November
October
September
August
July
June
May
April
March
February
January
1960
December
November
October
September
August
July
June
May
April
March
February
January
1959
December
November
October
September
August
July
June
May
April
March
February
January
1958
December
November
October
September
August
July
June
May
April
March
February
January
1957
December
November
October
September
August
July
June
May
April
March
February
January
1956
December
November
October
September
August
July
June
May
April
March
February
January
1955
December
November
October
September
August
July
June
May
April
March
February
January
1954
December
November
October
September
August
July
June
May
April
March
February
January
1953
December
November
October
September
August
July
June
May
April
March
February
January
1952
December
November
October
September
August
July
June
May
April
March
February
January
1951
December
November
October
September
August
July
June
May
April
March
February
January
1950
December
November
October
September
August
July
June
May
April
March
February
January
1949
December
November
October
September
August
July
June
May
April
March
February
January
1948
December
November
October
September
August
July
June
May
April
March
February
January
1947
December
November
October
September
August
July
June
May
April
March
February
January
1946
December
November
October
September
August
July
June
May
April
March
February
January
1945
December
November
October
September
August
July
June
May
April
March
February
January
1944
December
November
October
September
August
July
June
May
April
March
February
January
1943
December
November
October
September
August
July
June
May
April
March
February
January
1942
December
November
October
September
August
July
June
May
April
March
February
January
1941
December
November
October
September
August
July
June
May
April
March
February
January
1940
December
November
October
September
August
July
June
May
April
March
February
January
1939
December
November
October
September
August
July
June
May
April
March
February
January
1938
December
November
October
September
August
July
June
May
April
March
February
January
1937
December
November
October
September
August
July
June
May
April
March
February
January
1936
December
November
October
September
August
July
June
May
April
March
February
January
1935
December
November
October
September
August
July
June
May
April
March
February
January
1934
December
November
October
September
August
July
June
May
April
March
February
January
1933
December
November
October
September
August
July
June
May
April
March
February
January
1932
December
November
October
September
August
July
June
May
April
March
February
January
1931
December
November
October
September
August
July
June
May
April
March
February
January
1930
December
November
October
September
August
July
June
May
April
March
February
January
1929
December
November
October
September
August
July
June
May
April
March
February
January
1928
December
November
October
September
August
July
June
May
April
March
February
January
1927
December
November
October
September
August
July
June
May
April
March
February
January
1926
December
November
October
September
August
July
June
May
April
March
February
January
1925
December
November
October
September
August
July
June
May
April
March
February
January
1924
December
November
October
September
August
July
June
May
April
March
February
January
1923
December
November
October
September
August
July
June
May
April
March
February
January
1922
December
November
October
September
August
July
June
May
April
March
February
January
1921
December
November
October
September
August
July
June
May
April
March
February
January
1920
December
November
October
September
August
July
June
May
April
March
February
January
1919
December
November
October
September
August
July
June
May
April
March
February
January
1918
December
November
October
September
August
July
June
May
April
March
February
January
1917
December
November
October
September
August
July
June
May
April
March
February
January
1916
December
November
October
September
August
July
June
May
April
March
February
January
1915
December
November
October
September
August
July
June
May
April
March
February
January
1914
December
November
October
September
August
July
June
May
April
March
February
January
1913
December
November
October
September
August
July
June
May
April
March
February
January
1912
December
November
October
September
August
July
June
May
April
March
February
January
1911
December
November
October
September
August
July
June
May
April
March
February
January
1910
December
November
October
September
August
July
June
May
April
March
February
January
1909
December
November
October
September
August
July
June
May
April
March
February
January
1908
December
November
October
September
August
July
June
May
April
March
February
January
1907
December
November
October
September
August
July
June
May
April
March
February
January
1906
December
November
October
September
August
July
June
May
April
March
February
January
1905
December
November
October
September
August
July
June
May
April
March
February
January
1904
December
November
October
September
August
July
June
May
April
March
February
January
List overview
Download
OpenBIOS
March 2010
----- 2024 -----
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
January 2001
----- 2000 -----
December 2000
November 2000
October 2000
September 2000
August 2000
July 2000
June 2000
May 2000
April 2000
March 2000
February 2000
January 2000
----- 1999 -----
December 1999
November 1999
October 1999
September 1999
August 1999
July 1999
June 1999
May 1999
April 1999
March 1999
February 1999
January 1999
----- 1998 -----
December 1998
November 1998
October 1998
September 1998
August 1998
July 1998
June 1998
May 1998
April 1998
March 1998
February 1998
January 1998
----- 1997 -----
December 1997
November 1997
October 1997
September 1997
August 1997
July 1997
June 1997
May 1997
April 1997
March 1997
February 1997
January 1997
----- 1996 -----
December 1996
November 1996
October 1996
September 1996
August 1996
July 1996
June 1996
May 1996
April 1996
March 1996
February 1996
January 1996
----- 1995 -----
December 1995
November 1995
October 1995
September 1995
August 1995
July 1995
June 1995
May 1995
April 1995
March 1995
February 1995
January 1995
----- 1994 -----
December 1994
November 1994
October 1994
September 1994
August 1994
July 1994
June 1994
May 1994
April 1994
March 1994
February 1994
January 1994
----- 1993 -----
December 1993
November 1993
October 1993
September 1993
August 1993
July 1993
June 1993
May 1993
April 1993
March 1993
February 1993
January 1993
----- 1992 -----
December 1992
November 1992
October 1992
September 1992
August 1992
July 1992
June 1992
May 1992
April 1992
March 1992
February 1992
January 1992
----- 1991 -----
December 1991
November 1991
October 1991
September 1991
August 1991
July 1991
June 1991
May 1991
April 1991
March 1991
February 1991
January 1991
----- 1990 -----
December 1990
November 1990
October 1990
September 1990
August 1990
July 1990
June 1990
May 1990
April 1990
March 1990
February 1990
January 1990
----- 1989 -----
December 1989
November 1989
October 1989
September 1989
August 1989
July 1989
June 1989
May 1989
April 1989
March 1989
February 1989
January 1989
----- 1988 -----
December 1988
November 1988
October 1988
September 1988
August 1988
July 1988
June 1988
May 1988
April 1988
March 1988
February 1988
January 1988
----- 1987 -----
December 1987
November 1987
October 1987
September 1987
August 1987
July 1987
June 1987
May 1987
April 1987
March 1987
February 1987
January 1987
----- 1986 -----
December 1986
November 1986
October 1986
September 1986
August 1986
July 1986
June 1986
May 1986
April 1986
March 1986
February 1986
January 1986
----- 1985 -----
December 1985
November 1985
October 1985
September 1985
August 1985
July 1985
June 1985
May 1985
April 1985
March 1985
February 1985
January 1985
----- 1984 -----
December 1984
November 1984
October 1984
September 1984
August 1984
July 1984
June 1984
May 1984
April 1984
March 1984
February 1984
January 1984
----- 1983 -----
December 1983
November 1983
October 1983
September 1983
August 1983
July 1983
June 1983
May 1983
April 1983
March 1983
February 1983
January 1983
----- 1982 -----
December 1982
November 1982
October 1982
September 1982
August 1982
July 1982
June 1982
May 1982
April 1982
March 1982
February 1982
January 1982
----- 1981 -----
December 1981
November 1981
October 1981
September 1981
August 1981
July 1981
June 1981
May 1981
April 1981
March 1981
February 1981
January 1981
----- 1980 -----
December 1980
November 1980
October 1980
September 1980
August 1980
July 1980
June 1980
May 1980
April 1980
March 1980
February 1980
January 1980
----- 1979 -----
December 1979
November 1979
October 1979
September 1979
August 1979
July 1979
June 1979
May 1979
April 1979
March 1979
February 1979
January 1979
----- 1978 -----
December 1978
November 1978
October 1978
September 1978
August 1978
July 1978
June 1978
May 1978
April 1978
March 1978
February 1978
January 1978
----- 1977 -----
December 1977
November 1977
October 1977
September 1977
August 1977
July 1977
June 1977
May 1977
April 1977
March 1977
February 1977
January 1977
----- 1976 -----
December 1976
November 1976
October 1976
September 1976
August 1976
July 1976
June 1976
May 1976
April 1976
March 1976
February 1976
January 1976
----- 1975 -----
December 1975
November 1975
October 1975
September 1975
August 1975
July 1975
June 1975
May 1975
April 1975
March 1975
February 1975
January 1975
----- 1974 -----
December 1974
November 1974
October 1974
September 1974
August 1974
July 1974
June 1974
May 1974
April 1974
March 1974
February 1974
January 1974
----- 1973 -----
December 1973
November 1973
October 1973
September 1973
August 1973
July 1973
June 1973
May 1973
April 1973
March 1973
February 1973
January 1973
----- 1972 -----
December 1972
November 1972
October 1972
September 1972
August 1972
July 1972
June 1972
May 1972
April 1972
March 1972
February 1972
January 1972
----- 1971 -----
December 1971
November 1971
October 1971
September 1971
August 1971
July 1971
June 1971
May 1971
April 1971
March 1971
February 1971
January 1971
----- 1970 -----
December 1970
November 1970
October 1970
September 1970
August 1970
July 1970
June 1970
May 1970
April 1970
March 1970
February 1970
January 1970
----- 1969 -----
December 1969
November 1969
October 1969
September 1969
August 1969
July 1969
June 1969
May 1969
April 1969
March 1969
February 1969
January 1969
----- 1968 -----
December 1968
November 1968
October 1968
September 1968
August 1968
July 1968
June 1968
May 1968
April 1968
March 1968
February 1968
January 1968
----- 1967 -----
December 1967
November 1967
October 1967
September 1967
August 1967
July 1967
June 1967
May 1967
April 1967
March 1967
February 1967
January 1967
----- 1966 -----
December 1966
November 1966
October 1966
September 1966
August 1966
July 1966
June 1966
May 1966
April 1966
March 1966
February 1966
January 1966
----- 1965 -----
December 1965
November 1965
October 1965
September 1965
August 1965
July 1965
June 1965
May 1965
April 1965
March 1965
February 1965
January 1965
----- 1964 -----
December 1964
November 1964
October 1964
September 1964
August 1964
July 1964
June 1964
May 1964
April 1964
March 1964
February 1964
January 1964
----- 1963 -----
December 1963
November 1963
October 1963
September 1963
August 1963
July 1963
June 1963
May 1963
April 1963
March 1963
February 1963
January 1963
----- 1962 -----
December 1962
November 1962
October 1962
September 1962
August 1962
July 1962
June 1962
May 1962
April 1962
March 1962
February 1962
January 1962
----- 1961 -----
December 1961
November 1961
October 1961
September 1961
August 1961
July 1961
June 1961
May 1961
April 1961
March 1961
February 1961
January 1961
----- 1960 -----
December 1960
November 1960
October 1960
September 1960
August 1960
July 1960
June 1960
May 1960
April 1960
March 1960
February 1960
January 1960
----- 1959 -----
December 1959
November 1959
October 1959
September 1959
August 1959
July 1959
June 1959
May 1959
April 1959
March 1959
February 1959
January 1959
----- 1958 -----
December 1958
November 1958
October 1958
September 1958
August 1958
July 1958
June 1958
May 1958
April 1958
March 1958
February 1958
January 1958
----- 1957 -----
December 1957
November 1957
October 1957
September 1957
August 1957
July 1957
June 1957
May 1957
April 1957
March 1957
February 1957
January 1957
----- 1956 -----
December 1956
November 1956
October 1956
September 1956
August 1956
July 1956
June 1956
May 1956
April 1956
March 1956
February 1956
January 1956
----- 1955 -----
December 1955
November 1955
October 1955
September 1955
August 1955
July 1955
June 1955
May 1955
April 1955
March 1955
February 1955
January 1955
----- 1954 -----
December 1954
November 1954
October 1954
September 1954
August 1954
July 1954
June 1954
May 1954
April 1954
March 1954
February 1954
January 1954
----- 1953 -----
December 1953
November 1953
October 1953
September 1953
August 1953
July 1953
June 1953
May 1953
April 1953
March 1953
February 1953
January 1953
----- 1952 -----
December 1952
November 1952
October 1952
September 1952
August 1952
July 1952
June 1952
May 1952
April 1952
March 1952
February 1952
January 1952
----- 1951 -----
December 1951
November 1951
October 1951
September 1951
August 1951
July 1951
June 1951
May 1951
April 1951
March 1951
February 1951
January 1951
----- 1950 -----
December 1950
November 1950
October 1950
September 1950
August 1950
July 1950
June 1950
May 1950
April 1950
March 1950
February 1950
January 1950
----- 1949 -----
December 1949
November 1949
October 1949
September 1949
August 1949
July 1949
June 1949
May 1949
April 1949
March 1949
February 1949
January 1949
----- 1948 -----
December 1948
November 1948
October 1948
September 1948
August 1948
July 1948
June 1948
May 1948
April 1948
March 1948
February 1948
January 1948
----- 1947 -----
December 1947
November 1947
October 1947
September 1947
August 1947
July 1947
June 1947
May 1947
April 1947
March 1947
February 1947
January 1947
----- 1946 -----
December 1946
November 1946
October 1946
September 1946
August 1946
July 1946
June 1946
May 1946
April 1946
March 1946
February 1946
January 1946
----- 1945 -----
December 1945
November 1945
October 1945
September 1945
August 1945
July 1945
June 1945
May 1945
April 1945
March 1945
February 1945
January 1945
----- 1944 -----
December 1944
November 1944
October 1944
September 1944
August 1944
July 1944
June 1944
May 1944
April 1944
March 1944
February 1944
January 1944
----- 1943 -----
December 1943
November 1943
October 1943
September 1943
August 1943
July 1943
June 1943
May 1943
April 1943
March 1943
February 1943
January 1943
----- 1942 -----
December 1942
November 1942
October 1942
September 1942
August 1942
July 1942
June 1942
May 1942
April 1942
March 1942
February 1942
January 1942
----- 1941 -----
December 1941
November 1941
October 1941
September 1941
August 1941
July 1941
June 1941
May 1941
April 1941
March 1941
February 1941
January 1941
----- 1940 -----
December 1940
November 1940
October 1940
September 1940
August 1940
July 1940
June 1940
May 1940
April 1940
March 1940
February 1940
January 1940
----- 1939 -----
December 1939
November 1939
October 1939
September 1939
August 1939
July 1939
June 1939
May 1939
April 1939
March 1939
February 1939
January 1939
----- 1938 -----
December 1938
November 1938
October 1938
September 1938
August 1938
July 1938
June 1938
May 1938
April 1938
March 1938
February 1938
January 1938
----- 1937 -----
December 1937
November 1937
October 1937
September 1937
August 1937
July 1937
June 1937
May 1937
April 1937
March 1937
February 1937
January 1937
----- 1936 -----
December 1936
November 1936
October 1936
September 1936
August 1936
July 1936
June 1936
May 1936
April 1936
March 1936
February 1936
January 1936
----- 1935 -----
December 1935
November 1935
October 1935
September 1935
August 1935
July 1935
June 1935
May 1935
April 1935
March 1935
February 1935
January 1935
----- 1934 -----
December 1934
November 1934
October 1934
September 1934
August 1934
July 1934
June 1934
May 1934
April 1934
March 1934
February 1934
January 1934
----- 1933 -----
December 1933
November 1933
October 1933
September 1933
August 1933
July 1933
June 1933
May 1933
April 1933
March 1933
February 1933
January 1933
----- 1932 -----
December 1932
November 1932
October 1932
September 1932
August 1932
July 1932
June 1932
May 1932
April 1932
March 1932
February 1932
January 1932
----- 1931 -----
December 1931
November 1931
October 1931
September 1931
August 1931
July 1931
June 1931
May 1931
April 1931
March 1931
February 1931
January 1931
----- 1930 -----
December 1930
November 1930
October 1930
September 1930
August 1930
July 1930
June 1930
May 1930
April 1930
March 1930
February 1930
January 1930
----- 1929 -----
December 1929
November 1929
October 1929
September 1929
August 1929
July 1929
June 1929
May 1929
April 1929
March 1929
February 1929
January 1929
----- 1928 -----
December 1928
November 1928
October 1928
September 1928
August 1928
July 1928
June 1928
May 1928
April 1928
March 1928
February 1928
January 1928
----- 1927 -----
December 1927
November 1927
October 1927
September 1927
August 1927
July 1927
June 1927
May 1927
April 1927
March 1927
February 1927
January 1927
----- 1926 -----
December 1926
November 1926
October 1926
September 1926
August 1926
July 1926
June 1926
May 1926
April 1926
March 1926
February 1926
January 1926
----- 1925 -----
December 1925
November 1925
October 1925
September 1925
August 1925
July 1925
June 1925
May 1925
April 1925
March 1925
February 1925
January 1925
----- 1924 -----
December 1924
November 1924
October 1924
September 1924
August 1924
July 1924
June 1924
May 1924
April 1924
March 1924
February 1924
January 1924
----- 1923 -----
December 1923
November 1923
October 1923
September 1923
August 1923
July 1923
June 1923
May 1923
April 1923
March 1923
February 1923
January 1923
----- 1922 -----
December 1922
November 1922
October 1922
September 1922
August 1922
July 1922
June 1922
May 1922
April 1922
March 1922
February 1922
January 1922
----- 1921 -----
December 1921
November 1921
October 1921
September 1921
August 1921
July 1921
June 1921
May 1921
April 1921
March 1921
February 1921
January 1921
----- 1920 -----
December 1920
November 1920
October 1920
September 1920
August 1920
July 1920
June 1920
May 1920
April 1920
March 1920
February 1920
January 1920
----- 1919 -----
December 1919
November 1919
October 1919
September 1919
August 1919
July 1919
June 1919
May 1919
April 1919
March 1919
February 1919
January 1919
----- 1918 -----
December 1918
November 1918
October 1918
September 1918
August 1918
July 1918
June 1918
May 1918
April 1918
March 1918
February 1918
January 1918
----- 1917 -----
December 1917
November 1917
October 1917
September 1917
August 1917
July 1917
June 1917
May 1917
April 1917
March 1917
February 1917
January 1917
----- 1916 -----
December 1916
November 1916
October 1916
September 1916
August 1916
July 1916
June 1916
May 1916
April 1916
March 1916
February 1916
January 1916
----- 1915 -----
December 1915
November 1915
October 1915
September 1915
August 1915
July 1915
June 1915
May 1915
April 1915
March 1915
February 1915
January 1915
----- 1914 -----
December 1914
November 1914
October 1914
September 1914
August 1914
July 1914
June 1914
May 1914
April 1914
March 1914
February 1914
January 1914
----- 1913 -----
December 1913
November 1913
October 1913
September 1913
August 1913
July 1913
June 1913
May 1913
April 1913
March 1913
February 1913
January 1913
----- 1912 -----
December 1912
November 1912
October 1912
September 1912
August 1912
July 1912
June 1912
May 1912
April 1912
March 1912
February 1912
January 1912
----- 1911 -----
December 1911
November 1911
October 1911
September 1911
August 1911
July 1911
June 1911
May 1911
April 1911
March 1911
February 1911
January 1911
----- 1910 -----
December 1910
November 1910
October 1910
September 1910
August 1910
July 1910
June 1910
May 1910
April 1910
March 1910
February 1910
January 1910
----- 1909 -----
December 1909
November 1909
October 1909
September 1909
August 1909
July 1909
June 1909
May 1909
April 1909
March 1909
February 1909
January 1909
----- 1908 -----
December 1908
November 1908
October 1908
September 1908
August 1908
July 1908
June 1908
May 1908
April 1908
March 1908
February 1908
January 1908
----- 1907 -----
December 1907
November 1907
October 1907
September 1907
August 1907
July 1907
June 1907
May 1907
April 1907
March 1907
February 1907
January 1907
----- 1906 -----
December 1906
November 1906
October 1906
September 1906
August 1906
July 1906
June 1906
May 1906
April 1906
March 1906
February 1906
January 1906
----- 1905 -----
December 1905
November 1905
October 1905
September 1905
August 1905
July 1905
June 1905
May 1905
April 1905
March 1905
February 1905
January 1905
----- 1904 -----
December 1904
November 1904
October 1904
September 1904
August 1904
July 1904
June 1904
May 1904
April 1904
March 1904
February 1904
January 1904
openbios@openbios.org
11 participants
56 discussions
Start a n
N
ew thread
[commit] r693 - in trunk/openbios-devel: arch/amd64 arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include include/arch/common include/arch/ppc include/arch/sparc64 include/libopenbios in...
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 17:09:44 2010 New Revision: 693 URL:
http://tracker.coreboot.org/trac/openbios/changeset/693
Log: Fix the sys_info.h header file so it doesn't reference functions both inside and outside of libopenbios, and move the firmware configuration header file to include/arch/common. Following through the code showed that elfnote.c and linuxbios.c were being used by sys_info and so these are also renamed to elf_info.c and linuxbios_info.c for clarity. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/common/ trunk/openbios-devel/include/arch/common/fw_cfg.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/fw_cfg.h trunk/openbios-devel/include/libopenbios/sys_info.h (contents, props changed) - copied, changed from r692, trunk/openbios-devel/include/sys_info.h trunk/openbios-devel/libopenbios/elf_info.c (contents, props changed) - copied, changed from r692, trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/linuxbios_info.c (contents, props changed) - copied, changed from r692, trunk/openbios-devel/libopenbios/linuxbios.c Deleted: trunk/openbios-devel/include/openbios/fw_cfg.h trunk/openbios-devel/include/sys_info.h trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/linuxbios.c Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/builtin.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/multiboot.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/plainboot.c trunk/openbios-devel/arch/amd64/segment.c trunk/openbios-devel/arch/amd64/sys_info.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/builtin.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/entry.S trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/multiboot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/plainboot.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/builtin.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/multiboot.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/sparc64/plainboot.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/builtin.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/multiboot.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/plainboot.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/include/arch/ppc/io.h trunk/openbios-devel/include/arch/sparc64/io.h trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ #include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" int elf_load(struct sys_info *, const char *filename, const char *cmdline); int linux_load(struct sys_info *, const char *filename, const char *cmdline); Modified: trunk/openbios-devel/arch/amd64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include <asm/types.h> -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #define printf printk Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "segment.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -12,11 +12,12 @@ #include "dict.h" #include "kernel/kernel.h" #include "kernel/stack.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "relocate.h" void boot(void); +void collect_sys_info(struct sys_info *info); static char intdict[256 * 1024]; Modified: trunk/openbios-devel/arch/amd64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #define printf printk Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 17:09:44 2010 (r693) @@ -31,7 +31,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "arch/ppc/processor.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 17:09:44 2010 (r693) @@ -23,7 +23,7 @@ #include "kernel.h" #include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" //#define DEBUG_QEMU Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "a.out.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openprom.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 17:09:44 2010 (r693) @@ -33,6 +33,7 @@ // sys_info.c extern unsigned int qemu_mem_size; +extern void collect_sys_info(struct sys_info *info); // romvec.c extern struct linux_arguments_v0 obp_arg; Modified: trunk/openbios-devel/arch/sparc32/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "asm/types.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/entry.S Sun Mar 14 17:09:44 2010 (r693) @@ -12,7 +12,7 @@ #include "asm/crs.h" #define NO_QEMU_PROTOS #define NO_OPENBIOS_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #define CFG_ADDR 0x00000510 #define CFG_ASI 0x2d Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "asm/asi.h" #include "pgtsrmmu.h" #include "openprom.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define NCTX_SWIFT 0x100 Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -15,7 +15,7 @@ #include "kernel/stack.h" #include "openbios/nvram.h" #include "../../drivers/timer.h" // XXX -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc32/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #ifdef CONFIG_DEBUG_OBP Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "a.out.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 17:09:44 2010 (r693) @@ -37,6 +37,7 @@ // sys_info.c extern uint64_t qemu_mem_size; +extern void collect_sys_info(struct sys_info *info); // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); Modified: trunk/openbios-devel/arch/sparc64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "asm/types.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" /* ****************************************************************** Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/entry.S Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "lsu.h" #define NO_QEMU_PROTOS #define NO_OPENBIOS_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #define PROM_ADDR 0x1fff0000000 #define CFG_ADDR 0x1fe02000510 Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "spitfire.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #include "ofmem_sparc64.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,14 +11,14 @@ #include "drivers/drivers.h" #include "dict.h" #include "openbios/nvram.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "drivers/pci.h" #include "asm/pci.h" #include "boot.h" #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "video_subr.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/sparc64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -12,7 +12,7 @@ #include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/x86/builtin.c ============================================================================== --- trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -10,7 +10,7 @@ #include "kernel/kernel.h" #include "segment.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "segment.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -14,11 +14,12 @@ #include "kernel/stack.h" #include "drivers/drivers.h" #include "drivers/pci.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "relocate.h" void boot(void); +void collect_sys_info(struct sys_info *info); static unsigned char intdict[256 * 1024]; Modified: trunk/openbios-devel/arch/x86/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 17:09:44 2010 (r693) @@ -3,7 +3,7 @@ #include "libc/byteorder.h" #include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #if !defined(CONFIG_SPARC64) static volatile uint16_t *fw_cfg_cmd; Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 17:09:44 2010 (r693) @@ -21,7 +21,7 @@ #include "libopenbios/ofmem.h" #include "obio.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "escc.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Copied: trunk/openbios-devel/include/arch/common/fw_cfg.h (from r692, trunk/openbios-devel/include/openbios/fw_cfg.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Mar 14 17:09:44 2010 (r693, copy of r692, trunk/openbios-devel/include/openbios/fw_cfg.h) @@ -0,0 +1,84 @@ +#ifndef FW_CFG_H +#define FW_CFG_H + +#define FW_CFG_SIGNATURE 0x00 +#define FW_CFG_ID 0x01 +#define FW_CFG_UUID 0x02 +#define FW_CFG_RAM_SIZE 0x03 +#define FW_CFG_NOGRAPHIC 0x04 +#define FW_CFG_NB_CPUS 0x05 +#define FW_CFG_MACHINE_ID 0x06 +#define FW_CFG_KERNEL_ADDR 0x07 +#define FW_CFG_KERNEL_SIZE 0x08 +#define FW_CFG_KERNEL_CMDLINE 0x09 +#define FW_CFG_INITRD_ADDR 0x0a +#define FW_CFG_INITRD_SIZE 0x0b +#define FW_CFG_BOOT_DEVICE 0x0c +#define FW_CFG_NUMA 0x0d +#define FW_CFG_BOOT_MENU 0x0e +#define FW_CFG_MAX_CPUS 0x0f +#define FW_CFG_KERNEL_ENTRY 0x10 +#define FW_CFG_KERNEL_DATA 0x11 +#define FW_CFG_INITRD_DATA 0x12 +#define FW_CFG_CMDLINE_ADDR 0x13 +#define FW_CFG_CMDLINE_SIZE 0x14 +#define FW_CFG_CMDLINE_DATA 0x15 +#define FW_CFG_SETUP_ADDR 0x16 +#define FW_CFG_SETUP_SIZE 0x17 +#define FW_CFG_SETUP_DATA 0x18 +#define FW_CFG_FILE_DIR 0x19 + +#define FW_CFG_FILE_FIRST 0x20 +#define FW_CFG_FILE_SLOTS 0x10 +#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) + +#define FW_CFG_WRITE_CHANNEL 0x4000 +#define FW_CFG_ARCH_LOCAL 0x8000 +#define FW_CFG_ENTRY_MASK ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL) + +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03) +#define FW_CFG_PPC_CPUFREQ (FW_CFG_ARCH_LOCAL + 0x04) + +#define FW_CFG_INVALID 0xffff + +#ifndef NO_QEMU_PROTOS +typedef struct FWCfgFile { + uint32_t size; /* file size */ + uint16_t select; /* write this to 0x510 to read it */ + uint16_t reserved; + char name[56]; +} FWCfgFile; + +typedef struct FWCfgFiles { + uint32_t count; + FWCfgFile f[]; +} FWCfgFiles; + +typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); + +typedef struct _FWCfgState FWCfgState; +int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len); +int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); +int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); +int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value); +int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, + void *callback_opaque, uint8_t *data, size_t len); +int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, + uint8_t *data, uint32_t len); +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + target_phys_addr_t crl_addr, target_phys_addr_t data_addr); + +#endif /* NO_QEMU_PROTOS */ + +#ifndef NO_OPENBIOS_PROTOS +void fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes); +uint64_t fw_cfg_read_i64(uint16_t cmd); +uint32_t fw_cfg_read_i32(uint16_t cmd); +uint16_t fw_cfg_read_i16(uint16_t cmd); +void fw_cfg_init(void); +#endif /* NO_OPENBIOS_PROTOS */ + +#endif Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/include/arch/ppc/io.h Sun Mar 14 17:09:44 2010 (r693) @@ -4,7 +4,7 @@ #include "asm/types.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" extern unsigned long virt_offset; Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/include/arch/sparc64/io.h Sun Mar 14 17:09:44 2010 (r693) @@ -4,7 +4,7 @@ #include "asm/types.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" extern unsigned long va_shift; // Set in entry.S // Defined in ldscript Copied and modified: trunk/openbios-devel/include/libopenbios/sys_info.h (from r692, trunk/openbios-devel/include/sys_info.h) ============================================================================== --- trunk/openbios-devel/include/sys_info.h Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/include/libopenbios/sys_info.h Sun Mar 14 17:09:44 2010 (r693) @@ -22,7 +22,6 @@ unsigned long *dict_end; }; -void collect_sys_info(struct sys_info *info); void collect_elfboot_info(struct sys_info *info); void collect_linuxbios_info(struct sys_info *info); Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/libopenbios/build.xml Sun Mar 14 17:09:44 2010 (r693) @@ -4,15 +4,15 @@ <object source="bindings.c"/> <object source="client.c"/> <object source="console_common.c"/> - <object source="elfnote.c" condition="X86"/> - <object source="elfnote.c" condition="AMD64"/> - <object source="elfnote.c" condition="SPARC32"/> - <object source="elfnote.c" condition="SPARC64"/> - <object source="elfload.c" condition="PPC"/> + <object source="elf_info.c" condition="X86"/> + <object source="elf_info.c" condition="AMD64"/> + <object source="elf_info.c" condition="SPARC32"/> + <object source="elf_info.c" condition="SPARC64"/> + <object source="elf_info.c" condition="PPC"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ipchecksum.c"/> - <object source="linuxbios.c" condition="LINUXBIOS"/> + <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> </library> Copied and modified: trunk/openbios-devel/libopenbios/elf_info.c (from r692, trunk/openbios-devel/libopenbios/elfnote.c) ============================================================================== --- trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ /* Support for ELF Boot Proposal as a boot image */ #include "openbios/config.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "asm/io.h" #include "libopenbios/ipchecksum.h" #include "openbios-version.h" Copied and modified: trunk/openbios-devel/libopenbios/linuxbios_info.c (from r692, trunk/openbios-devel/libopenbios/linuxbios.c) ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "asm/io.h" #include "linuxbios.h" #include "libopenbios/ipchecksum.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #ifdef CONFIG_DEBUG_BOOT #define debug printk
3
2
0
0
[commit] r696 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 drivers include libopenbios packages
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 21:10:01 2010 New Revision: 696 URL:
http://tracker.coreboot.org/trac/openbios/changeset/696
Log: Split video_subr.h into its separate components so that they can live in the right places, rather than placing the definitions from lots of different C files into a single header. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Deleted: trunk/openbios-devel/include/video_subr.h Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga.h trunk/openbios-devel/drivers/vga_load_regs.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 21:10:01 2010 (r696) @@ -35,6 +35,9 @@ extern unsigned int qemu_mem_size; extern void collect_sys_info(struct sys_info *info); +// console.c +void cls(void); + // romvec.c extern struct linux_arguments_v0 obp_arg; Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 21:10:01 2010 (r696) @@ -9,9 +9,11 @@ #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" -#include "video_subr.h" +#include "libopenbios/console.h" #include "libopenbios/ofmem.h" +void cls(void); + #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 21:10:01 2010 (r696) @@ -18,7 +18,7 @@ #include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" -#include "video_subr.h" +#include "packages/video.h" #define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 21:10:01 2010 (r696) @@ -41,6 +41,7 @@ // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); +void cls(void); // lib.c void ob_mmu_init(const char *cpuname, uint64_t ram_size); Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 21:10:01 2010 (r696) @@ -11,7 +11,6 @@ #include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "openbios.h" -#include "video_subr.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 21:10:01 2010 (r696) @@ -19,7 +19,6 @@ #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#include "video_subr.h" #include "libopenbios/ofmem.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 21:10:01 2010 (r696) @@ -23,7 +23,7 @@ #include "libc/vsprintf.h" #include "drivers/drivers.h" -#include "video_subr.h" +#include "drivers/vga.h" #include "timer.h" #include "pci.h" #include "pci_database.h" Modified: trunk/openbios-devel/drivers/vga.h ============================================================================== --- trunk/openbios-devel/drivers/vga.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga.h Sun Mar 14 21:10:01 2010 (r696) @@ -14,7 +14,7 @@ #ifndef VGA_H_INCL #define VGA_H_INCL 1 -#include "video_subr.h" +#include "drivers/vga.h" //#include <cpu/p5/io.h> Modified: trunk/openbios-devel/drivers/vga_load_regs.c ============================================================================== --- trunk/openbios-devel/drivers/vga_load_regs.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga_load_regs.c Sun Mar 14 21:10:01 2010 (r696) @@ -1,5 +1,5 @@ #include "asm/io.h" -#include "video_subr.h" +#include "drivers/vga.h" #include "vga.h" /* Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 21:10:01 2010 (r696) @@ -24,7 +24,8 @@ #include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" -#include "video_subr.h" +#include "drivers/vga.h" +#include "packages/video.h" #include "libopenbios/ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 21:10:01 2010 (r696) @@ -15,7 +15,8 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" -#include "video_subr.h" +#include "libopenbios/console.h" +#include "packages/video.h" #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 21:10:01 2010 (r696) @@ -19,7 +19,9 @@ #include "libc/diskio.h" #include "libopenbios/ofmem.h" #include "drivers/drivers.h" -#include "video_subr.h" +#include "packages/video.h" +#include "libopenbios/console.h" +#include "drivers/vga.h" typedef struct osi_fb_info { unsigned long mphys;
1
0
0
0
[commit] r695 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 arch/x86/xbox drivers fs fs/ext2 f...
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 18:19:58 2010 New Revision: 695 URL:
http://tracker.coreboot.org/trac/openbios/changeset/695
Log: Move the basic OpenBIOS configuration header files from include/openbios to include/. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/config.h (contents, props changed) - copied, changed from r692, trunk/openbios-devel/include/openbios/config.h trunk/openbios-devel/include/sysinclude.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/sysinclude.h Deleted: trunk/openbios-devel/include/openbios/config.h trunk/openbios-devel/include/openbios/sysinclude.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/builtin.c trunk/openbios-devel/arch/amd64/console.c trunk/openbios-devel/arch/amd64/context.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/lib.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/loadfs.c trunk/openbios-devel/arch/amd64/multiboot.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/plainboot.c trunk/openbios-devel/arch/amd64/segment.c trunk/openbios-devel/arch/amd64/sys_info.c trunk/openbios-devel/arch/ppc/briq/briq.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/briq/tree.c trunk/openbios-devel/arch/ppc/briq/vfd.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/console.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/mol.c trunk/openbios-devel/arch/ppc/mol/osi-blk.c trunk/openbios-devel/arch/ppc/mol/osi-scsi.c trunk/openbios-devel/arch/ppc/mol/prom.c trunk/openbios-devel/arch/ppc/mol/pseudodisk.c trunk/openbios-devel/arch/ppc/mol/tree.c trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/pearpc/console.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.c trunk/openbios-devel/arch/ppc/pearpc/tree.c trunk/openbios-devel/arch/ppc/pearpc/vfd.c trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/ppc/qemu/vfd.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/builtin.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/loadfs.c trunk/openbios-devel/arch/sparc32/multiboot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/plainboot.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/builtin.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/loadfs.c trunk/openbios-devel/arch/sparc64/multiboot.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/sparc64/plainboot.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/unix/blk.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/unix/plugins.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/builtin.c trunk/openbios-devel/arch/x86/console.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/exception.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/lib.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/loadfs.c trunk/openbios-devel/arch/x86/multiboot.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/plainboot.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/arch/x86/xbox/console.c trunk/openbios-devel/arch/x86/xbox/methods.c trunk/openbios-devel/drivers/adb_bus.c trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/adb_mouse.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/kbd.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/timer.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/fs/ext2/libext2.h trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c trunk/openbios-devel/fs/grubfs/glue.h trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/block.c trunk/openbios-devel/fs/hfs/btree.c trunk/openbios-devel/fs/hfs/data.c trunk/openbios-devel/fs/hfs/file.c trunk/openbios-devel/fs/hfs/hfs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfs/low.c trunk/openbios-devel/fs/hfs/medium.c trunk/openbios-devel/fs/hfs/node.c trunk/openbios-devel/fs/hfs/record.c trunk/openbios-devel/fs/hfs/volume.c trunk/openbios-devel/fs/hfsplus/blockiter.c trunk/openbios-devel/fs/hfsplus/btree.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/hfsplus/include/swab.h trunk/openbios-devel/fs/hfsplus/libhfsp.c trunk/openbios-devel/fs/hfsplus/record.c trunk/openbios-devel/fs/hfsplus/unicode.c trunk/openbios-devel/fs/hfsplus/volume.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/libiso9660.h trunk/openbios-devel/include/drivers/drivers.h trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/include/libc/vsprintf.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/primitives.c trunk/openbios-devel/kernel/stack.c trunk/openbios-devel/libc/ctype.c trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libc/extra.c trunk/openbios-devel/libc/misc.c trunk/openbios-devel/libc/string.c trunk/openbios-devel/libc/vsprintf.c trunk/openbios-devel/libopenbios/bindings.c trunk/openbios-devel/libopenbios/client.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/libopenbios/elf_info.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/libopenbios/linuxbios_info.c trunk/openbios-devel/libopenbios/ofmem_common.c trunk/openbios-devel/packages/bootinfo-loader.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/deblocker.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c trunk/openbios-devel/packages/video.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/amd64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include <asm/types.h> #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/amd64/console.c ============================================================================== --- trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/amd64/context.c ============================================================================== --- trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "segment.h" #include "context.h" Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/amd64/lib.c ============================================================================== --- trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include <stdarg.h> #include "libc/stdlib.h" Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/amd64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/amd64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/ppc/briq/briq.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/briq/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" void devtree_init( void ) Modified: trunk/openbios-devel/arch/ppc/briq/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "dict.h" #include "libopenbios/bindings.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/ppc/mol/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "mol/mol.h" Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "mol/mol.h" Modified: trunk/openbios-devel/arch/ppc/mol/mol.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-blk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-scsi.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "scsi_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/prom.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/prom.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/prom.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "osi_calls.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/mol/pseudodisk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "osi_calls.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/mol/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ /* TODO: Clean up MOLisms in a decent way */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" void devtree_init( void ) Modified: trunk/openbios-devel/arch/ppc/pearpc/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ */ #include "qemu-dict.h" -#include "openbios/config.h" +#include "config.h" #include "dict.h" #include "libopenbios/bindings.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" Modified: trunk/openbios-devel/arch/ppc/qemu/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "qemu/qemu.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/a.out.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/sparc32/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "context.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/sparc32/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ */ #include "openprom.h" -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "arch/common/a.out.h" Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/sparc64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "context.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * FCode boot loader */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "spitfire.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "ofmem_sparc64.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "dict.h" Modified: trunk/openbios-devel/arch/sparc64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/unix/blk.c ============================================================================== --- trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "blk.h" Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/unix/plugins.c ============================================================================== --- trunk/openbios-devel/arch/unix/plugins.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/plugins.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 18:19:58 2010 (r695) @@ -24,9 +24,9 @@ #include <getopt.h> #endif -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include "mconfig.h" -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "dict.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/x86/builtin.c ============================================================================== --- trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" /* Modified: trunk/openbios-devel/arch/x86/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "segment.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/x86/exception.c ============================================================================== --- trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/x86/lib.c ============================================================================== --- trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include <stdarg.h> #include "libc/stdlib.h" Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/x86/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/x86/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/xbox/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/x86/xbox/methods.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" // #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/adb_bus.c ============================================================================== --- trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/adb_mouse.c ============================================================================== --- trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 18:19:58 2010 (r695) @@ -13,7 +13,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 18:19:58 2010 (r695) @@ -13,7 +13,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 18:19:58 2010 (r695) @@ -4,7 +4,7 @@ ** Copyright 1999 Pete Zaitcev ** This code is licensed under GNU General Public License. **/ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "iommu.h" Modified: trunk/openbios-devel/drivers/kbd.c ============================================================================== --- trunk/openbios-devel/drivers/kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "asm/types.h" #include "kbd.h" Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/pci.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/timer.c ============================================================================== --- trunk/openbios-devel/drivers/timer.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/timer.c Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "timer.h" #include "asm/io.h" Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * MA 02110-1301, USA. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" Modified: trunk/openbios-devel/fs/ext2/libext2.h ============================================================================== --- trunk/openbios-devel/fs/ext2/libext2.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/ext2/libext2.h Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ #ifndef __LIBEXT2_H__ #define __LIBEXT2_H__ -#include "openbios/config.h" +#include "config.h" #include "ext2.h" extern ext2_VOLUME* ext2_mount(int fd); Modified: trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ #ifdef FSYS_EXT2FS -#include "openbios/config.h" +#include "config.h" #include "shared.h" #include "filesys.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/fs/grubfs/glue.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/glue.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/glue.h Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ #define __GLUE_H #include "asm/types.h" -#include "openbios/config.h" +#include "config.h" #include "libc/byteorder.h" typedef uint64_t sector_t; Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "filesys.h" Modified: trunk/openbios-devel/fs/hfs/block.c ============================================================================== --- trunk/openbios-devel/fs/hfs/block.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/block.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: block.c,v 1.11 1998/11/02 22:08:52 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfs/btree.c ============================================================================== --- trunk/openbios-devel/fs/hfs/btree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/btree.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: btree.c,v 1.10 1998/11/02 22:08:54 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfs/data.c ============================================================================== --- trunk/openbios-devel/fs/hfs/data.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/data.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: data.c,v 1.7 1998/11/02 22:08:57 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "data.h" #define TIMEDIFF 2082844800UL Modified: trunk/openbios-devel/fs/hfs/file.c ============================================================================== --- trunk/openbios-devel/fs/hfs/file.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/file.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: file.c,v 1.9 1998/11/02 22:08:59 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "file.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfs/hfs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/hfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: hfs.c,v 1.15 1998/11/02 22:09:00 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "data.h" #include "block.h" Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "fs/fs.h" #include "libc/vsprintf.h" #include "libhfs.h" Modified: trunk/openbios-devel/fs/hfs/low.c ============================================================================== --- trunk/openbios-devel/fs/hfs/low.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/low.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: low.c,v 1.8 1998/11/02 22:09:03 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "low.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/medium.c ============================================================================== --- trunk/openbios-devel/fs/hfs/medium.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/medium.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: medium.c,v 1.4 1998/11/02 22:09:04 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "block.h" #include "low.h" Modified: trunk/openbios-devel/fs/hfs/node.c ============================================================================== --- trunk/openbios-devel/fs/hfs/node.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/node.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: node.c,v 1.9 1998/11/02 22:09:05 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "node.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/record.c ============================================================================== --- trunk/openbios-devel/fs/hfs/record.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/record.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: record.c,v 1.9 1998/11/02 22:09:07 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "record.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfs/volume.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/volume.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: volume.c,v 1.12 1998/11/02 22:09:10 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "volume.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfsplus/blockiter.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/blockiter.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/blockiter.c Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: blockiter.c,v 1.2 2000/10/17 05:58:46 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "blockiter.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfsplus/btree.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/btree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/btree.c Sun Mar 14 18:19:58 2010 (r695) @@ -28,7 +28,7 @@ * $Id: btree.c,v 1.14 2000/10/25 05:43:04 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "volume.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "fs/fs.h" #include "libhfsp.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfsplus/include/swab.h ============================================================================== --- trunk/openbios-devel/fs/hfsplus/include/swab.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/include/swab.h Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: swab.h,v 1.1.1.1 2002/03/05 19:50:29 klaus Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libc/byteorder.h" /* basic fuction: Modified: trunk/openbios-devel/fs/hfsplus/libhfsp.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/libhfsp.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/libhfsp.c Sun Mar 14 18:19:58 2010 (r695) @@ -23,7 +23,7 @@ * $Id: libhfsp.c,v 1.1.1.1 2000/07/25 10:33:40 kkaempf Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" const char *hfsp_error = "no error"; /* static error string */ Modified: trunk/openbios-devel/fs/hfsplus/record.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/record.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/record.c Sun Mar 14 18:19:58 2010 (r695) @@ -26,7 +26,7 @@ * $Id: record.c,v 1.24 2000/10/17 05:58:46 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "hfstime.h" #include "record.h" Modified: trunk/openbios-devel/fs/hfsplus/unicode.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/unicode.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/unicode.c Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "unicode.h" Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/volume.c Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: volume.c,v 1.21 2000/10/25 05:43:04 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "volume.h" #include "record.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/fs/iso9660/libiso9660.h ============================================================================== --- trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ #ifndef __LIBISO9660_H__ #define __LIBISO9660_H__ -#include "openbios/config.h" +#include "config.h" #include "iso9660.h" extern iso9660_VOLUME* iso9660_mount(int fd); Copied and modified: trunk/openbios-devel/include/config.h (from r692, trunk/openbios-devel/include/openbios/config.h) ============================================================================== --- trunk/openbios-devel/include/openbios/config.h Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/include/config.h Sun Mar 14 18:19:58 2010 (r695) @@ -60,7 +60,7 @@ #endif /* BOOTSTRAP */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #ifndef MIN #define MIN(x,y) (((x) < (y)) ? (x) : (y)) Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ #ifndef OPENBIOS_DRIVERS_H #define OPENBIOS_DRIVERS_H -#include "openbios/config.h" +#include "config.h" #ifdef CONFIG_DRIVER_PCI /* drivers/pci.c */ Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/libc/string.h Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ #ifndef _H_STRING #define _H_STRING -#include "openbios/config.h" +#include "config.h" #define bzero(s,n) memset( s, 0, n ) #define atol(nptr) strtol(nptr, NULL, 10 ) Modified: trunk/openbios-devel/include/libc/vsprintf.h ============================================================================== --- trunk/openbios-devel/include/libc/vsprintf.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/libc/vsprintf.h Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ #define _H_VSPRINTF #include <stdarg.h> -#include "openbios/config.h" +#include "config.h" extern int vsprintf(char *buf, const char *fmt, va_list args ); extern int sprintf(char * buf, const char *fmt, ...); Copied: trunk/openbios-devel/include/sysinclude.h (from r692, trunk/openbios-devel/include/openbios/sysinclude.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/sysinclude.h Sun Mar 14 18:19:58 2010 (r695, copy of r692, trunk/openbios-devel/include/openbios/sysinclude.h) @@ -0,0 +1,20 @@ +#ifndef __SYSINCLUDE_H +#define __SYSINCLUDE_H + +#ifdef BOOTSTRAP +#include "asm/types.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#else /* BOOTSTRAP */ +#include "libc/stdlib.h" +#include "libc/string.h" +#endif /* BOOTSTRAP */ + +extern int printk( const char *fmt, ... ) \ + __attribute__ ((format (printf, 1, 2))); +#ifdef BOOTSTRAP +#define printk printf +#endif + +#endif /* __SYSINCLUDE_H */ Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -21,9 +21,9 @@ #include <getopt.h> #endif -#include "openbios/config.h" +#include "config.h" #include "kernel/stack.h" -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include "kernel/kernel.h" #include "dict.h" #include "cross.h" Modified: trunk/openbios-devel/kernel/dict.c ============================================================================== --- trunk/openbios-devel/kernel/dict.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/dict.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "dict.h" #ifdef BOOTSTRAP Modified: trunk/openbios-devel/kernel/primitives.c ============================================================================== --- trunk/openbios-devel/kernel/primitives.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/primitives.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,8 +6,8 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" -#include "openbios/sysinclude.h" +#include "config.h" +#include "sysinclude.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "dict.h" Modified: trunk/openbios-devel/kernel/stack.c ============================================================================== --- trunk/openbios-devel/kernel/stack.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/stack.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "kernel/stack.h" #include "cross.h" Modified: trunk/openbios-devel/libc/ctype.c ============================================================================== --- trunk/openbios-devel/libc/ctype.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/ctype.c Sun Mar 14 18:19:58 2010 (r695) @@ -4,7 +4,7 @@ * Copyright (C) 1991, 1992 Linus Torvalds */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" const unsigned char _ctype[] = { Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/diskio.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/libc/extra.c ============================================================================== --- trunk/openbios-devel/libc/extra.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/extra.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/vsprintf.h" #include "libopenbios/bindings.h" Modified: trunk/openbios-devel/libc/misc.c ============================================================================== --- trunk/openbios-devel/libc/misc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/misc.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" int errno_int; Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/string.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * reentrant and should be faster). Use only strsep() in new code, please. */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/stdlib.h" Modified: trunk/openbios-devel/libc/vsprintf.c ============================================================================== --- trunk/openbios-devel/libc/vsprintf.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/vsprintf.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * - changed to provide snprintf and vsnprintf functions */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libc/stdlib.h" Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/client.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/of.h" Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" #include "video_subr.h" Modified: trunk/openbios-devel/libopenbios/elf_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,5 +1,5 @@ /* Support for ELF Boot Proposal as a boot image */ -#include "openbios/config.h" +#include "config.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "asm/io.h" Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -29,7 +29,7 @@ (at your option) any later version. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/libopenbios/linuxbios_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,7 +1,7 @@ /* Adapted from Etherboot 5.1.8 */ -#include "openbios/config.h" -#include "openbios/sysinclude.h" +#include "config.h" +#include "sysinclude.h" #include "asm/types.h" #include "asm/io.h" #include "linuxbios.h" Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/cmdline.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/packages/deblocker.c ============================================================================== --- trunk/openbios-devel/packages/deblocker.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/deblocker.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/disk-label.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "packages.h" Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mac-parts.h" #include "packages.h" Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h"
1
0
0
0
[commit] r694 - in trunk/openbios-devel: arch/amd64 arch/sparc32 arch/sparc64 arch/x86 include include/arch/common include/libopenbios include/openbios libopenbios packages
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 18:06:20 2010 New Revision: 694 URL:
http://tracker.coreboot.org/trac/openbios/changeset/694
Log: Move the a.out, ELF and XCOFF header files down into include/arch/common. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/common/a.out.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/a.out.h trunk/openbios-devel/include/arch/common/elf.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/elf.h trunk/openbios-devel/include/arch/common/elf_boot.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/elf_boot.h trunk/openbios-devel/include/arch/common/xcoff.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/xcoff.h Deleted: trunk/openbios-devel/include/a.out.h trunk/openbios-devel/include/elf_boot.h trunk/openbios-devel/include/openbios/elf.h trunk/openbios-devel/include/openbios/xcoff.h Modified: trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/include/libopenbios/elfload.h trunk/openbios-devel/libopenbios/elf_info.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:06:20 2010 (r694) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Copied: trunk/openbios-devel/include/arch/common/a.out.h (from r692, trunk/openbios-devel/include/a.out.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/a.out.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/a.out.h) @@ -0,0 +1,271 @@ +#ifndef __A_OUT_GNU_H__ +#define __A_OUT_GNU_H__ + +#define __GNU_EXEC_MACROS__ + +#ifndef __STRUCT_EXEC_OVERRIDE__ + +#include "asm/a.out.h" + +#endif /* __STRUCT_EXEC_OVERRIDE__ */ + +/* these go in the N_MACHTYPE field */ +enum machine_type { +#if defined (M_OLDSUN2) + M__OLDSUN2 = M_OLDSUN2, +#else + M_OLDSUN2 = 0, +#endif +#if defined (M_68010) + M__68010 = M_68010, +#else + M_68010 = 1, +#endif +#if defined (M_68020) + M__68020 = M_68020, +#else + M_68020 = 2, +#endif +#if defined (M_SPARC) + M__SPARC = M_SPARC, +#else + M_SPARC = 3, +#endif + /* skip a bunch so we don't run into any of sun's numbers */ + M_386 = 100, + M_MIPS1 = 151, /* MIPS R3000/R3000 binary */ + M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ +}; + +#if !defined (N_MAGIC) +#define N_MAGIC(exec) ((exec).a_info & 0xffff) +#endif +#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) +#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) +#define N_SET_INFO(exec, magic, type, flags) \ + ((exec).a_info = ((magic) & 0xffff) \ + | (((int)(type) & 0xff) << 16) \ + | (((flags) & 0xff) << 24)) +#define N_SET_MAGIC(exec, magic) \ + ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff))) + +#define N_SET_MACHTYPE(exec, machtype) \ + ((exec).a_info = \ + ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) + +#define N_SET_FLAGS(exec, flags) \ + ((exec).a_info = \ + ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) + +/* Code indicating object file or impure executable. */ +#define OMAGIC 0407 +/* Code indicating pure executable. */ +#define NMAGIC 0410 +/* Code indicating demand-paged executable. */ +#define ZMAGIC 0413 +/* This indicates a demand-paged executable with the header in the text. + The first page is unmapped to help trap NULL pointer references */ +#define QMAGIC 0314 + +/* Code indicating core file. */ +#define CMAGIC 0421 + +#if !defined (N_BADMAG) +#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \ + && N_MAGIC(x) != NMAGIC \ + && N_MAGIC(x) != ZMAGIC \ + && N_MAGIC(x) != QMAGIC) +#endif + +#define _N_HDROFF(x) (1024 - sizeof (struct exec)) + +#if !defined (N_TXTOFF) +#define N_TXTOFF(x) \ + (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \ + (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec))) +#endif + +#if !defined (N_DATOFF) +#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) +#endif + +#if !defined (N_TRELOFF) +#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) +#endif + +#if !defined (N_DRELOFF) +#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x)) +#endif + +#if !defined (N_SYMOFF) +#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x)) +#endif + +#if !defined (N_STROFF) +#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x)) +#endif + +/* Address of text segment in memory after it is loaded. */ +#if !defined (N_TXTADDR) +#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) +#endif + +/* Address of data segment in memory after it is loaded. + Note that it is up to you to define SEGMENT_SIZE + on machines not listed here. */ +#if defined(vax) || defined(hp300) || defined(pyr) +#define SEGMENT_SIZE page_size +#endif +#ifdef sony +#define SEGMENT_SIZE 0x2000 +#endif /* Sony. */ +#ifdef is68k +#define SEGMENT_SIZE 0x20000 +#endif +#if defined(m68k) && defined(PORTAR) +#define PAGE_SIZE 0x400 +#define SEGMENT_SIZE PAGE_SIZE +#endif + +#if !defined(SEGMENT_SIZE) +#ifdef linux +#if defined(__i386__) || defined(__mc68000__) +#define SEGMENT_SIZE 1024 +#elif defined(__sparc__) +#define SEGMENT_SIZE 0x2000 +#else +#if defined(PAGE_SIZE) +#define SEGMENT_SIZE PAGE_SIZE +#endif +#endif +#endif +#endif + +#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1)) + +#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) + +#ifndef N_DATADDR +#define N_DATADDR(x) \ + (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \ + : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) +#endif + +/* Address of bss segment in memory after it is loaded. */ +#if !defined (N_BSSADDR) +#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data) +#endif + +#if !defined (N_NLIST_DECLARED) +struct nlist { + union { + char *n_name; + struct nlist *n_next; + long n_strx; + } n_un; + unsigned char n_type; + char n_other; + short n_desc; + unsigned long n_value; +}; +#endif /* no N_NLIST_DECLARED. */ + +#if !defined (N_UNDF) +#define N_UNDF 0 +#endif +#if !defined (N_ABS) +#define N_ABS 2 +#endif +#if !defined (N_TEXT) +#define N_TEXT 4 +#endif +#if !defined (N_DATA) +#define N_DATA 6 +#endif +#if !defined (N_BSS) +#define N_BSS 8 +#endif +#if !defined (N_FN) +#define N_FN 15 +#endif + +#if !defined (N_EXT) +#define N_EXT 1 +#endif +#if !defined (N_TYPE) +#define N_TYPE 036 +#endif +#if !defined (N_STAB) +#define N_STAB 0340 +#endif + +/* The following type indicates the definition of a symbol as being + an indirect reference to another symbol. The other symbol + appears as an undefined reference, immediately following this symbol. + + Indirection is asymmetrical. The other symbol's value will be used + to satisfy requests for the indirect symbol, but not vice versa. + If the other symbol does not have a definition, libraries will + be searched to find a definition. */ +#define N_INDR 0xa + +/* The following symbols refer to set elements. + All the N_SET[ATDB] symbols with the same name form one set. + Space is allocated for the set in the text section, and each set + element's value is stored into one word of the space. + The first word of the space is the length of the set (number of elements). + + The address of the set is made into an N_SETV symbol + whose name is the same as the name of the set. + This symbol acts like a N_DATA global symbol + in that it can satisfy undefined external references. */ + +/* These appear as input to LD, in a .o file. */ +#define N_SETA 0x14 /* Absolute set element symbol */ +#define N_SETT 0x16 /* Text set element symbol */ +#define N_SETD 0x18 /* Data set element symbol */ +#define N_SETB 0x1A /* Bss set element symbol */ + +/* This is output from LD. */ +#define N_SETV 0x1C /* Pointer to set vector in data area. */ + +#if !defined (N_RELOCATION_INFO_DECLARED) +/* This structure describes a single relocation to be performed. + The text-relocation section of the file is a vector of these structures, + all of which apply to the text section. + Likewise, the data-relocation section applies to the data section. */ + +struct relocation_info +{ + /* Address (within segment) to be relocated. */ + int r_address; + /* The meaning of r_symbolnum depends on r_extern. */ + unsigned int r_symbolnum:24; + /* Nonzero means value is a pc-relative offset + and it should be relocated for changes in its own address + as well as for changes in the symbol or section specified. */ + unsigned int r_pcrel:1; + /* Length (as exponent of 2) of the field to be relocated. + Thus, a value of 2 indicates 1<<2 bytes. */ + unsigned int r_length:2; + /* 1 => relocate with value of symbol. + r_symbolnum is the index of the symbol + in file's the symbol table. + 0 => relocate with the address of a segment. + r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS + (the N_EXT bit may be set also, but signifies nothing). */ + unsigned int r_extern:1; + /* Four bits that aren't used, but when writing an object file + it is desirable to clear them. */ +#ifdef NS32K + unsigned r_bsr:1; + unsigned r_disp:1; + unsigned r_pad:2; +#else + unsigned int r_pad:4; +#endif +}; +#endif /* no N_RELOCATION_INFO_DECLARED. */ + + +#endif /* __A_OUT_GNU_H__ */ Copied: trunk/openbios-devel/include/arch/common/elf.h (from r692, trunk/openbios-devel/include/openbios/elf.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/elf.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/openbios/elf.h) @@ -0,0 +1,227 @@ +#ifndef ELF_H +#define ELF_H + +#define EI_NIDENT 16 /* Size of e_ident array. */ + +/* Values for e_type. */ +#define ET_NONE 0 /* No file type */ +#define ET_REL 1 /* Relocatable file */ +#define ET_EXEC 2 /* Executable file */ +#define ET_DYN 3 /* Shared object file */ +#define ET_CORE 4 /* Core file */ + +/* Values for e_machine (architecute). */ +#define EM_NONE 0 /* No machine */ +#define EM_M32 1 /* AT&T WE 32100 */ +#define EM_SPARC 2 /* SUN SPARC */ +#define EM_386 3 /* Intel 80386+ */ +#define EM_68K 4 /* Motorola m68k family */ +#define EM_88K 5 /* Motorola m88k family */ +#define EM_486 6 /* Perhaps disused */ +#define EM_860 7 /* Intel 80860 */ +#define EM_MIPS 8 /* MIPS R3000 big-endian */ +#define EM_S370 9 /* IBM System/370 */ +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ + +#define EM_PARISC 15 /* HPPA */ +#define EM_VPP500 17 /* Fujitsu VPP500 */ +#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ +#define EM_960 19 /* Intel 80960 */ +#define EM_PPC 20 /* PowerPC */ +#define EM_PPC64 21 /* PowerPC 64-bit */ +#define EM_S390 22 /* IBM S390 */ + +#define EM_V800 36 /* NEC V800 series */ +#define EM_FR20 37 /* Fujitsu FR20 */ +#define EM_RH32 38 /* TRW RH-32 */ +#define EM_RCE 39 /* Motorola RCE */ +#define EM_ARM 40 /* ARM */ +#define EM_FAKE_ALPHA 41 /* Digital Alpha */ +#define EM_SH 42 /* Hitachi SH */ +#define EM_SPARCV9 43 /* SPARC v9 64-bit */ +#define EM_TRICORE 44 /* Siemens Tricore */ +#define EM_ARC 45 /* Argonaut RISC Core */ +#define EM_H8_300 46 /* Hitachi H8/300 */ +#define EM_H8_300H 47 /* Hitachi H8/300H */ +#define EM_H8S 48 /* Hitachi H8S */ +#define EM_H8_500 49 /* Hitachi H8/500 */ +#define EM_IA_64 50 /* Intel Merced */ +#define EM_MIPS_X 51 /* Stanford MIPS-X */ +#define EM_COLDFIRE 52 /* Motorola Coldfire */ +#define EM_68HC12 53 /* Motorola M68HC12 */ +#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/ +#define EM_PCP 55 /* Siemens PCP */ +#define EM_NCPU 56 /* Sony nCPU embeeded RISC */ +#define EM_NDR1 57 /* Denso NDR1 microprocessor */ +#define EM_STARCORE 58 /* Motorola Start*Core processor */ +#define EM_ME16 59 /* Toyota ME16 processor */ +#define EM_ST100 60 /* STMicroelectronic ST100 processor */ +#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ +#define EM_X86_64 62 /* AMD x86-64 architecture */ +#define EM_PDSP 63 /* Sony DSP Processor */ + +#define EM_FX66 66 /* Siemens FX66 microcontroller */ +#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ +#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ +#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ +#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ +#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ +#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ +#define EM_SVX 73 /* Silicon Graphics SVx */ +#define EM_AT19 74 /* STMicroelectronics ST19 8 bit mc */ +#define EM_VAX 75 /* Digital VAX */ +#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ +#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ +#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */ +#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */ +#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */ +#define EM_HUANY 81 /* Harvard University machine-independent object files */ +#define EM_PRISM 82 /* SiTera Prism */ +#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */ +#define EM_FR30 84 /* Fujitsu FR30 */ +#define EM_D10V 85 /* Mitsubishi D10V */ +#define EM_D30V 86 /* Mitsubishi D30V */ +#define EM_V850 87 /* NEC v850 */ +#define EM_M32R 88 /* Mitsubishi M32R */ +#define EM_MN10300 89 /* Matsushita MN10300 */ +#define EM_MN10200 90 /* Matsushita MN10200 */ +#define EM_PJ 91 /* picoJava */ +#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ +#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ +#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ +#define EM_NUM 95 + +/* Values for p_type. */ +#define PT_NULL 0 /* Unused entry. */ +#define PT_LOAD 1 /* Loadable segment. */ +#define PT_DYNAMIC 2 /* Dynamic linking information segment. */ +#define PT_INTERP 3 /* Pathname of interpreter. */ +#define PT_NOTE 4 /* Auxiliary information. */ +#define PT_SHLIB 5 /* Reserved (not used). */ +#define PT_PHDR 6 /* Location of program header itself. */ + +/* Values for p_flags. */ +#define PF_X 0x1 /* Executable. */ +#define PF_W 0x2 /* Writable. */ +#define PF_R 0x4 /* Readable. */ + + +#define ELF_PROGRAM_RETURNS_BIT 0x8000000 /* e_flags bit 31 */ + +#define EI_MAG0 0 +#define ELFMAG0 0x7f + +#define EI_MAG1 1 +#define ELFMAG1 'E' + +#define EI_MAG2 2 +#define ELFMAG2 'L' + +#define EI_MAG3 3 +#define ELFMAG3 'F' + +#define ELFMAG "\177ELF" + +#define EI_CLASS 4 /* File class byte index */ +#define ELFCLASSNONE 0 /* Invalid class */ +#define ELFCLASS32 1 /* 32-bit objects */ +#define ELFCLASS64 2 /* 64-bit objects */ + +#define EI_DATA 5 /* Data encodeing byte index */ +#define ELFDATANONE 0 /* Invalid data encoding */ +#define ELFDATA2LSB 1 /* 2's complement little endian */ +#define ELFDATA2MSB 2 /* 2's complement big endian */ + +#define EI_VERSION 6 /* File version byte index */ + /* Value must be EV_CURRENT */ + +#define EV_NONE 0 /* Invalid ELF Version */ +#define EV_CURRENT 1 /* Current version */ + +#define ELF32_PHDR_SIZE (8*4) /* Size of an elf program header */ + +#ifndef __ASSEMBLY__ +#include "asm/types.h" +/* + * ELF definitions common to all 32-bit architectures. + */ + +typedef uint32_t Elf32_Addr; +typedef uint16_t Elf32_Half; +typedef uint32_t Elf32_Off; +typedef int32_t Elf32_Sword; +typedef uint32_t Elf32_Word; +typedef uint32_t Elf32_Size; + +typedef uint64_t Elf64_Addr; +typedef uint16_t Elf64_Half; +typedef uint64_t Elf64_Off; +typedef int32_t Elf64_Sword; +typedef uint32_t Elf64_Word; +typedef uint64_t Elf64_Size; + +/* + * ELF header. + */ +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf32_Half e_type; /* File type. */ + Elf32_Half e_machine; /* Machine architecture. */ + Elf32_Word e_version; /* ELF format version. */ + Elf32_Addr e_entry; /* Entry point. */ + Elf32_Off e_phoff; /* Program header file offset. */ + Elf32_Off e_shoff; /* Section header file offset. */ + Elf32_Word e_flags; /* Architecture-specific flags. */ + Elf32_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf32_Half e_phentsize; /* Size of program header entry. */ + Elf32_Half e_phnum; /* Number of program header entries. */ + Elf32_Half e_shentsize; /* Size of section header entry. */ + Elf32_Half e_shnum; /* Number of section header entries. */ + Elf32_Half e_shstrndx; /* Section name strings section. */ +} Elf32_Ehdr; + +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf64_Half e_type; /* File type. */ + Elf64_Half e_machine; /* Machine architecture. */ + Elf64_Word e_version; /* ELF format version. */ + Elf64_Addr e_entry; /* Entry point. */ + Elf64_Off e_phoff; /* Program header file offset. */ + Elf64_Off e_shoff; /* Section header file offset. */ + Elf64_Word e_flags; /* Architecture-specific flags. */ + Elf64_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf64_Half e_phentsize; /* Size of program header entry. */ + Elf64_Half e_phnum; /* Number of program header entries. */ + Elf64_Half e_shentsize; /* Size of section header entry. */ + Elf64_Half e_shnum; /* Number of section header entries. */ + Elf64_Half e_shstrndx; /* Section name strings section. */ +} Elf64_Ehdr; + +/* + * Program header. + */ +typedef struct { + Elf32_Word p_type; /* Entry type. */ + Elf32_Off p_offset; /* File offset of contents. */ + Elf32_Addr p_vaddr; /* Virtual address (not used). */ + Elf32_Addr p_paddr; /* Physical address. */ + Elf32_Size p_filesz; /* Size of contents in file. */ + Elf32_Size p_memsz; /* Size of contents in memory. */ + Elf32_Word p_flags; /* Access permission flags. */ + Elf32_Size p_align; /* Alignment in memory and file. */ +} Elf32_Phdr; + +typedef struct { + Elf64_Word p_type; /* Entry type. */ + Elf64_Word p_flags; /* Access permission flags. */ + Elf64_Off p_offset; /* File offset of contents. */ + Elf64_Addr p_vaddr; /* Virtual address (not used). */ + Elf64_Addr p_paddr; /* Physical address. */ + Elf64_Size p_filesz; /* Size of contents in file. */ + Elf64_Size p_memsz; /* Size of contents in memory. */ + Elf64_Size p_align; /* Alignment in memory and file. */ +} Elf64_Phdr; + +#endif /* __ASSEMBLY__ */ + +#endif /* ELF_H */ Copied: trunk/openbios-devel/include/arch/common/elf_boot.h (from r692, trunk/openbios-devel/include/elf_boot.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/elf_boot.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/elf_boot.h) @@ -0,0 +1,105 @@ +#ifndef ELF_BOOT_H +#define ELF_BOOT_H + + +/* This defines the structure of a table of parameters useful for ELF + * bootable images. These parameters are all passed and generated + * by the bootloader to the booted image. For simplicity and + * consistency the Elf Note format is reused. + * + * All of the information must be Position Independent Data. + * That is it must be safe to relocate the whole ELF boot parameter + * block without changing the meaning or correctnes of the data. + * Additionally it must be safe to permute the order of the ELF notes + * to any possible permutation without changing the meaning or correctness + * of the data. + * + */ + +#define ELF_BHDR_MAGIC 0x0E1FB007 + +#ifndef __ASSEMBLY__ +typedef uint16_t Elf_Half; +typedef uint32_t Elf_Word; + +/* + * Elf boot notes... + */ + +typedef struct Elf_Bhdr +{ + Elf_Word b_signature; /* "0x0E1FB007" */ + Elf_Word b_size; + Elf_Half b_checksum; + Elf_Half b_records; +} Elf_Bhdr; + +/* + * ELF Notes. + */ + +typedef struct Elf_Nhdr +{ + Elf_Word n_namesz; /* Length of the note's name. */ + Elf_Word n_descsz; /* Length of the note's descriptor. */ + Elf_Word n_type; /* Type of the note. */ +} Elf_Nhdr; + +#endif /* __ASSEMBLY__ */ + +/* Standardized Elf image notes for booting... The name for all of these is ELFBoot */ +#define ELF_NOTE_BOOT "ELFBoot" + +#define EIN_PROGRAM_NAME 0x00000001 +/* The program in this ELF file */ +#define EIN_PROGRAM_VERSION 0x00000002 +/* The version of the program in this ELF file */ +#define EIN_PROGRAM_CHECKSUM 0x00000003 +/* ip style checksum of the memory image. */ + + +/* Linux image notes for booting... The name for all of these is Linux */ + +#define LIN_COMMAND_LINE 0x00000001 +/* The command line to pass to the loaded kernel. */ +#define LIN_ROOT_DEV 0x00000002 +/* The root dev to pass to the loaded kernel. */ +#define LIN_RAMDISK_FLAGS 0x00000003 +/* Various old ramdisk flags */ +#define LIN_INITRD_START 0x00000004 +/* Start of the ramdisk in bytes */ +#define LIN_INITRD_SIZE 0x00000005 +/* Size of the ramdisk in bytes */ + +/* Notes that are passed to a loaded image */ +/* For the standard elf boot notes n_namesz must be zero */ +#define EBN_FIRMWARE_TYPE 0x00000001 +/* ASCIZ name of the platform firmware. */ +#define EBN_BOOTLOADER_NAME 0x00000002 +/* This specifies just the ASCIZ name of the bootloader */ +#define EBN_BOOTLOADER_VERSION 0x00000003 +/* This specifies the version of the bootloader as an ASCIZ string */ +#define EBN_COMMAND_LINE 0x00000004 +/* This specifies a command line that can be set by user interaction, + * and is provided as a free form ASCIZ string to the loaded image. + */ +#define EBN_NOP 0x00000005 +/* A note nop note has no meaning, useful for inserting explicit padding */ +#define EBN_LOADED_IMAGE 0x00000006 +/* An ASCIZ string naming the loaded image */ + + +/* Etherboot specific notes */ +#define EB_PARAM_NOTE "Etherboot" +#define EB_IA64_SYSTAB 0x00000001 +#define EB_IA64_MEMMAP 0x00000002 +#define EB_IA64_FPSWA 0x00000003 +#define EB_IA64_CONINFO 0x00000004 +#define EB_BOOTP_DATA 0x00000005 +#define EB_HEADER 0x00000006 +#define EB_IA64_IMAGE_HANDLE 0x00000007 +#define EB_I386_MEMMAP 0x00000008 + +extern const struct elf_image_note elf_image_notes; + +#endif /* ELF_BOOT_H */ Copied: trunk/openbios-devel/include/arch/common/xcoff.h (from r692, trunk/openbios-devel/include/openbios/xcoff.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/xcoff.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/openbios/xcoff.h) @@ -0,0 +1,98 @@ +#ifndef XCOFF_H +#define XCOFF_H + +/* XCOFF executable loader */ + +typedef struct COFF_filehdr_t { + uint16_t f_magic; /* magic number */ + uint16_t f_nscns; /* number of sections */ + uint32_t f_timdat; /* time & date stamp */ + uint32_t f_symptr; /* file pointer to symtab */ + uint32_t f_nsyms; /* number of symtab entries */ + uint16_t f_opthdr; /* sizeof(optional hdr) */ + uint16_t f_flags; /* flags */ +} COFF_filehdr_t; + +/* IBM RS/6000 */ + +#define U802WRMAGIC 0x02DA /* writeable text segments **chh** */ +#define U802ROMAGIC 0x02DF /* readonly sharable text segments */ +#define U802TOCMAGIC 0x02E1 /* readonly text segments and TOC */ +#define U802TOMAGIC 0x01DF + +/* + * Bits for f_flags: + * + * F_RELFLG relocation info stripped from file + * F_EXEC file is executable (i.e. no unresolved external + * references) + * F_LNNO line numbers stripped from file + * F_LSYMS local symbols stripped from file + * F_MINMAL this is a minimal object file (".m") output of fextract + * F_UPDATE this is a fully bound update file, output of ogen + * F_SWABD this file has had its bytes swabbed (in names) + * F_AR16WR this file has the byte ordering of an AR16WR + * (e.g. 11/70) machine + * F_AR32WR this file has the byte ordering of an AR32WR machine + * (e.g. vax and iNTEL 386) + * F_AR32W this file has the byte ordering of an AR32W machine + * (e.g. 3b,maxi) + * F_PATCH file contains "patch" list in optional header + * F_NODF (minimal file only) no decision functions for + * replaced functions + */ + +#define COFF_F_RELFLG 0000001 +#define COFF_F_EXEC 0000002 +#define COFF_F_LNNO 0000004 +#define COFF_F_LSYMS 0000010 +#define COFF_F_MINMAL 0000020 +#define COFF_F_UPDATE 0000040 +#define COFF_F_SWABD 0000100 +#define COFF_F_AR16WR 0000200 +#define COFF_F_AR32WR 0000400 +#define COFF_F_AR32W 0001000 +#define COFF_F_PATCH 0002000 +#define COFF_F_NODF 0002000 + +typedef struct COFF_aouthdr_t { + uint16_t magic; /* type of file */ + uint16_t vstamp; /* version stamp */ + uint32_t tsize; /* text size in bytes, padded to FW bdry */ + uint32_t dsize; /* initialized data " " */ + uint32_t bsize; /* uninitialized data " " */ + uint32_t entry; /* entry pt. */ + uint32_t text_start; /* base of text used for this file */ + uint32_t data_start; /* base of data used for this file */ + uint32_t o_toc; /* address of TOC */ + uint16_t o_snentry; /* section number of entry point */ + uint16_t o_sntext; /* section number of .text section */ + uint16_t o_sndata; /* section number of .data section */ + uint16_t o_sntoc; /* section number of TOC */ + uint16_t o_snloader; /* section number of .loader section */ + uint16_t o_snbss; /* section number of .bss section */ + uint16_t o_algntext; /* .text alignment */ + uint16_t o_algndata; /* .data alignment */ + uint16_t o_modtype; /* module type (??) */ + uint16_t o_cputype; /* cpu type */ + uint32_t o_maxstack; /* max stack size (??) */ + uint32_t o_maxdata; /* max data size (??) */ + char o_resv2[12]; /* reserved */ +} COFF_aouthdr_t; + +#define AOUT_MAGIC 0x010b + +typedef struct COFF_scnhdr_t { + char s_name[8]; /* section name */ + uint32_t s_paddr; /* physical address, aliased s_nlib */ + uint32_t s_vaddr; /* virtual address */ + uint32_t s_size; /* section size */ + uint32_t s_scnptr; /* file ptr to raw data for section */ + uint32_t s_relptr; /* file ptr to relocation */ + uint32_t s_lnnoptr; /* file ptr to line numbers */ + uint16_t s_nreloc; /* number of relocation entries */ + uint16_t s_nlnno; /* number of line number entries */ + uint32_t s_flags; /* flags */ +} COFF_scnhdr_t; + +#endif /* XCOFF_H */ Modified: trunk/openbios-devel/include/libopenbios/elfload.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 18:06:20 2010 (r694) @@ -17,7 +17,7 @@ #ifndef _H_ELFLOAD #define _H_ELFLOAD -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" extern int is_elf( int fd, int offs ); Modified: trunk/openbios-devel/libopenbios/elf_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ /* Support for ELF Boot Proposal as a boot image */ #include "openbios/config.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "asm/io.h" #include "libopenbios/ipchecksum.h" Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -33,7 +33,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "libc/diskio.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #define DEBUG 0 #define MAX_HEADERS 32 Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:06:20 2010 (r694) @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" /* TODO: manage ELF notes section */ Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:06:20 2010 (r694) @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/xcoff.h" +#include "arch/common/xcoff.h" //#define DEBUG_XCOFF
1
0
0
0
[commit] r692 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include/drivers include/openbios packages
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 16:19:41 2010 New Revision: 692 URL:
http://tracker.coreboot.org/trac/openbios/changeset/692
Log: Move the driver header files into include/drivers to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/drivers/ trunk/openbios-devel/include/drivers/drivers.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/drivers.h trunk/openbios-devel/include/drivers/pci.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/pci.h Deleted: trunk/openbios-devel/include/openbios/drivers.h trunk/openbios-devel/include/openbios/pci.h Modified: trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -13,7 +13,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:19:41 2010 (r692) @@ -22,9 +22,9 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "openbios/nvram.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "qemu/qemu.h" #include "libopenbios/ofmem.h" #include "openbios-version.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:19:41 2010 (r692) @@ -20,7 +20,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/string.h" #include "qemu/qemu.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:19:41 2010 (r692) @@ -20,7 +20,7 @@ #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:19:41 2010 (r692) @@ -6,7 +6,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "openbios.h" #include "video_subr.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:19:41 2010 (r692) @@ -10,7 +10,7 @@ #include "openprom.h" #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "openbios.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,12 +8,12 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "dict.h" #include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "asm/pci.h" #include "boot.h" #include "../../drivers/timer.h" // XXX Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -12,8 +12,8 @@ #include "dict.h" #include "kernel/kernel.h" #include "kernel/stack.h" -#include "openbios/drivers.h" -#include "openbios/pci.h" +#include "drivers/drivers.h" +#include "drivers/pci.h" #include "sys_info.h" #include "openbios.h" #include "relocate.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:19:41 2010 (r692) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:19:41 2010 (r692) @@ -2,7 +2,7 @@ #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/ofmem.h" #include "escc.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,7 +19,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "asm/io.h" #include "scsi.h" #include "asm/dma.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:19:41 2010 (r692) @@ -4,7 +4,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "timer.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,7 +19,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "ide.h" #include "hdreg.h" #include "timer.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:19:41 2010 (r692) @@ -6,7 +6,7 @@ **/ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "iommu.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:19:41 2010 (r692) @@ -14,11 +14,11 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "macio.h" #include "cuda.h" #include "escc.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #define OW_IO_NVRAM_SIZE 0x00020000 #define OW_IO_NVRAM_OFFSET 0x00060000 Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:19:41 2010 (r692) @@ -16,7 +16,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "openbios/nvram.h" #include "libopenbios/ofmem.h" #include "obio.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" /* ****************************************************************** Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" /* ****************************************************************** Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:19:41 2010 (r692) @@ -18,11 +18,11 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "video_subr.h" #include "timer.h" #include "pci.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:19:41 2010 (r692) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "libc/vsprintf.h" #include "pci_database.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:19:41 2010 (r692) @@ -15,7 +15,7 @@ #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/ofmem.h" #define SBUS_REGS 0x28 Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,8 +19,8 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" -#include "openbios/drivers.h" +#include "drivers/pci.h" +#include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" Copied: trunk/openbios-devel/include/drivers/drivers.h (from r689, trunk/openbios-devel/include/openbios/drivers.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 16:19:41 2010 (r692, copy of r689, trunk/openbios-devel/include/openbios/drivers.h) @@ -0,0 +1,127 @@ +/* + * OpenBIOS driver prototypes + * + * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ +#ifndef OPENBIOS_DRIVERS_H +#define OPENBIOS_DRIVERS_H + +#include "openbios/config.h" + +#ifdef CONFIG_DRIVER_PCI +/* drivers/pci.c */ +int ob_pci_init(void); +#endif + +#if defined(CONFIG_DRIVER_PCI) || defined(CONFIG_DRIVER_ESCC) +#ifdef CONFIG_PPC +extern int is_apple(void); +extern int is_oldworld(void); +extern int is_newworld(void); +#else +static inline int is_apple(void) +{ + return 0; +} +static inline int is_oldworld(void) +{ + return 0; +} +static inline int is_newworld(void) +{ + return 0; +} +#endif +#define AAPL(_cmd) do { if (is_apple()) _cmd; } while(0) +#define OLDWORLD(_cmd) do { if (is_oldworld()) _cmd; } while(0) +#define NEWWORLD(_cmd) do { if (is_newworld()) _cmd; } while(0) +#endif +#ifdef CONFIG_DRIVER_SBUS +/* drivers/sbus.c */ +int ob_sbus_init(uint64_t base, int machine_id); + +/* arch/sparc32/console.c */ +void tcx_init(uint64_t base); +void kbd_init(uint64_t base); +#endif +#ifdef CONFIG_DRIVER_IDE +/* drivers/ide.c */ +int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, + uint32_t io_port1, uint32_t ctl_port1); +int macio_ide_init(const char *path, uint32_t addr, int nb_channels); +#endif +#ifdef CONFIG_DRIVER_ESP +/* drivers/esp.c */ +int ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, + unsigned long dmaoffset); +#endif +#ifdef CONFIG_DRIVER_OBIO +/* drivers/obio.c */ +int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, + unsigned long counter_offset, unsigned long intr_offset, + unsigned long aux1_offset, unsigned long aux2_offset); +int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, + int cpu); + +/* drivers/iommu.c */ +void ob_init_iommu(uint64_t base); +void *dvma_alloc(int size, unsigned int *pphys); + +/* drivers/sbus.c */ +extern uint16_t graphic_depth; + +/* drivers/obio.c */ +extern volatile unsigned char *power_reg; +extern volatile unsigned int *reset_reg; +extern volatile struct sun4m_timer_regs *counter_regs; + +void ob_new_obio_device(const char *name, const char *type); +unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); +void ob_intr(int intr); + +/* arch/sparc32/romvec.c */ +extern const char *obp_stdin_path, *obp_stdout_path; +extern char obp_stdin, obp_stdout; + +/* arch/sparc32/boot.c */ +extern uint32_t kernel_image; +extern uint32_t kernel_size; +extern uint32_t qemu_cmdline; +extern uint32_t cmdline_size; +extern char boot_device; +#endif +#ifdef CONFIG_DRIVER_FLOPPY +int ob_floppy_init(const char *path, const char *dev_name, + unsigned long io_base, unsigned long mmio_base); +#endif +#ifdef CONFIG_DRIVER_PC_KBD +void ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int pc_kbd_dataready(void); +unsigned char pc_kbd_readdata(void); +#endif +#ifdef CONFIG_DRIVER_PC_SERIAL +void ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int uart_init(int port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +#endif +#ifdef CONFIG_DRIVER_ESCC +int uart_init(uint64_t port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +void serial_cls(void); +#ifdef CONFIG_DRIVER_ESCC_SUN +int keyboard_dataready(void); +unsigned char keyboard_readdata(void); +#endif +#endif +#endif /* OPENBIOS_DRIVERS_H */ Copied: trunk/openbios-devel/include/drivers/pci.h (from r689, trunk/openbios-devel/include/openbios/pci.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/drivers/pci.h Sun Mar 14 16:19:41 2010 (r692, copy of r689, trunk/openbios-devel/include/openbios/pci.h) @@ -0,0 +1,210 @@ +#ifndef _H_PCI +#define _H_PCI + +typedef uint32_t pci_addr; + +typedef struct pci_arch_t pci_arch_t; + +struct pci_arch_t { + const char * name; + uint16_t vendor_id; + uint16_t device_id; + unsigned long cfg_addr; + unsigned long cfg_data; + unsigned long cfg_base; + unsigned long cfg_len; + unsigned long mem_base; + unsigned long mem_len; + unsigned long io_base; + unsigned long io_len; + unsigned long rbase; + unsigned long rlen; + uint8_t irqs[4]; +}; + +extern const pci_arch_t *arch; + +/* Device tree offsets */ + +#define PCI_INT_MAP_PCI0 0 +#define PCI_INT_MAP_PCI1 1 +#define PCI_INT_MAP_PCI2 2 +#define PCI_INT_MAP_PCI_INT 3 +#define PCI_INT_MAP_PIC_HANDLE 4 +#define PCI_INT_MAP_PIC_INT 5 +#define PCI_INT_MAP_PIC_POL 6 + +/* Device classes and subclasses */ + +#define PCI_BASE_CLASS_STORAGE 0x01 +#define PCI_SUBCLASS_STORAGE_SCSI 0x00 +#define PCI_SUBCLASS_STORAGE_IDE 0x01 +#define PCI_SUBCLASS_STORAGE_FLOPPY 0x02 +#define PCI_SUBCLASS_STORAGE_IPI 0x03 +#define PCI_SUBCLASS_STORAGE_RAID 0x04 +#define PCI_SUBCLASS_STORAGE_ATA 0x05 +#define PCI_SUBCLASS_STORAGE_SAS 0x07 +#define PCI_SUBCLASS_STORAGE_OTHER 0x80 + +#define PCI_BASE_CLASS_NETWORK 0x02 +#define PCI_SUBCLASS_NETWORK_ETHERNET 0x00 +#define PCI_SUBCLASS_NETWORK_TOKEN_RING 0x01 +#define PCI_SUBCLASS_NETWORK_FDDI 0x02 +#define PCI_SUBCLASS_NETWORK_ATM 0x03 +#define PCI_SUBCLASS_NETWORK_ISDN 0x04 +#define PCI_SUBCLASS_NETWORK_WORDFIP 0x05 +#define PCI_SUBCLASS_NETWORK_PICMG214 0x06 +#define PCI_SUBCLASS_NETWORK_OTHER 0x80 + +#define PCI_BASE_CLASS_DISPLAY 0x03 +#define PCI_SUBCLASS_DISPLAY_VGA 0x00 +#define PCI_SUBCLASS_DISPLAY_XGA 0x01 +#define PCI_SUBCLASS_DISPLAY_3D 0x02 +#define PCI_SUBCLASS_DISPLAY_OTHER 0x80 + +#define PCI_BASE_CLASS_MULTIMEDIA 0x04 +#define PCI_SUBCLASS_MULTIMEDIA_VIDEO 0x00 +#define PCI_SUBCLASS_MULTIMEDIA_AUDIO 0x01 +#define PCI_SUBCLASS_MULTIMEDIA_PHONE 0x02 +#define PCI_SUBCLASS_MULTIMEDIA_OTHER 0x80 + +#define PCI_BASE_CLASS_MEMORY 0x05 +#define PCI_SUBCLASS_MEMORY_RAM 0x00 +#define PCI_SUBCLASS_MEMORY_FLASH 0x01 + +#define PCI_BASE_CLASS_BRIDGE 0x06 +#define PCI_SUBCLASS_BRIDGE_HOST 0x00 +#define PCI_SUBCLASS_BRIDGE_ISA 0x01 +#define PCI_SUBCLASS_BRIDGE_EISA 0x02 +#define PCI_SUBCLASS_BRIDGE_MC 0x03 +#define PCI_SUBCLASS_BRIDGE_PCI 0x04 +#define PCI_SUBCLASS_BRIDGE_PCMCIA 0x05 +#define PCI_SUBCLASS_BRIDGE_NUBUS 0x06 +#define PCI_SUBCLASS_BRIDGE_CARDBUS 0x07 +#define PCI_SUBCLASS_BRIDGE_RACEWAY 0x08 +#define PCI_SUBCLASS_BRIDGE_PCI_SEMITP 0x09 +#define PCI_SUBCLASS_BRIDGE_IB_PCI 0x0a +#define PCI_SUBCLASS_BRIDGE_OTHER 0x80 + +#define PCI_BASE_CLASS_COMMUNICATION 0x07 +#define PCI_SUBCLASS_COMMUNICATION_SERIAL 0x00 +#define PCI_SUBCLASS_COMMUNICATION_PARALLEL 0x01 +#define PCI_SUBCLASS_COMMUNICATION_MULTISERIAL 0x02 +#define PCI_SUBCLASS_COMMUNICATION_MODEM 0x03 +#define PCI_SUBCLASS_COMMUNICATION_GPIB 0x04 +#define PCI_SUBCLASS_COMMUNICATION_SC 0x05 +#define PCI_SUBCLASS_COMMUNICATION_OTHER 0x80 + +#define PCI_BASE_CLASS_SYSTEM 0x08 +#define PCI_SUBCLASS_SYSTEM_PIC 0x00 +#define PCI_SUBCLASS_SYSTEM_DMA 0x01 +#define PCI_SUBCLASS_SYSTEM_TIMER 0x02 +#define PCI_SUBCLASS_SYSTEM_RTC 0x03 +#define PCI_SUBCLASS_SYSTEM_PCI_HOTPLUG 0x04 +#define PCI_SUBCLASS_SYSTEM_OTHER 0x80 + +#define PCI_BASE_CLASS_INPUT 0x09 +#define PCI_SUBCLASS_INPUT_KEYBOARD 0x00 +#define PCI_SUBCLASS_INPUT_PEN 0x01 +#define PCI_SUBCLASS_INPUT_MOUSE 0x02 +#define PCI_SUBCLASS_INPUT_SCANNER 0x03 +#define PCI_SUBCLASS_INPUT_GAMEPORT 0x04 +#define PCI_SUBCLASS_INPUT_OTHER 0x80 + +#define PCI_BASE_CLASS_DOCKING 0x0a +#define PCI_SUBCLASS_DOCKING_GENERIC 0x00 +#define PCI_SUBCLASS_DOCKING_OTHER 0x80 + +#define PCI_BASE_CLASS_PROCESSOR 0x0b +#define PCI_SUBCLASS_PROCESSOR_386 0x00 +#define PCI_SUBCLASS_PROCESSOR_486 0x01 +#define PCI_SUBCLASS_PROCESSOR_PENTIUM 0x02 +#define PCI_SUBCLASS_PROCESSOR_ALPHA 0x10 +#define PCI_SUBCLASS_PROCESSOR_POWERPC 0x20 +#define PCI_SUBCLASS_PROCESSOR_MIPS 0x30 +#define PCI_SUBCLASS_PROCESSOR_CO 0x40 + +#define PCI_BASE_CLASS_SERIAL 0x0c +#define PCI_SUBCLASS_SERIAL_FIREWIRE 0x00 +#define PCI_SUBCLASS_SERIAL_ACCESS 0x01 +#define PCI_SUBCLASS_SERIAL_SSA 0x02 +#define PCI_SUBCLASS_SERIAL_USB 0x03 +#define PCI_SUBCLASS_SERIAL_FIBER 0x04 +#define PCI_SUBCLASS_SERIAL_SMBUS 0x05 +#define PCI_SUBCLASS_SERIAL_IB 0x06 +#define PCI_SUBCLASS_SERIAL_IPMI 0x07 +#define PCI_SUBCLASS_SERIAL_SERCOS 0x08 +#define PCI_SUBCLASS_SERIAL_CANBUS 0x09 + +#define PCI_BASE_CLASS_WIRELESS 0x0d +#define PCI_SUBCLASS_WIRELESS_IRDA 0x00 +#define PCI_SUBCLASS_WIRELESS_CIR 0x01 +#define PCI_SUBCLASS_WIRELESS_RF_CONTROLLER 0x10 +#define PCI_SUBCLASS_WIRELESS_BLUETOOTH 0x11 +#define PCI_SUBCLASS_WIRELESS_BROADBAND 0x12 +#define PCI_SUBCLASS_WIRELESS_OTHER 0x80 + +#define PCI_BASE_CLASS_SATELLITE 0x0f +#define PCI_SUBCLASS_SATELLITE_TV 0x00 +#define PCI_SUBCLASS_SATELLITE_AUDIO 0x01 +#define PCI_SUBCLASS_SATELLITE_VOICE 0x03 +#define PCI_SUBCLASS_SATELLITE_DATA 0x04 + +#define PCI_BASE_CLASS_CRYPT 0x10 +#define PCI_SUBCLASS_CRYPT_NETWORK 0x00 +#define PCI_SUBCLASS_CRYPT_ENTERTAINMENT 0x01 +#define PCI_SUBCLASS_CRYPT_OTHER 0x80 + +#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11 +#define PCI_SUBCLASS_SP_DPIO 0x00 +#define PCI_SUBCLASS_SP_PERF 0x01 +#define PCI_SUBCLASS_SP_SYNCH 0x10 +#define PCI_SUBCLASS_SP_MANAGEMENT 0x20 +#define PCI_SUBCLASS_SP_OTHER 0x80 + +#define PCI_CLASS_OTHERS 0xff + +/* Vendors and devices. */ + +#define PCI_VENDOR_ID_ATI 0x1002 +#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046 + +#define PCI_VENDOR_ID_DEC 0x1011 +#define PCI_DEVICE_ID_DEC_21154 0x0026 + +#define PCI_VENDOR_ID_IBM 0x1014 +#define PCI_DEVICE_ID_IBM_OPENPIC 0x0002 +#define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff + +#define PCI_VENDOR_ID_MOTOROLA 0x1057 +#define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 +#define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 + +#define PCI_VENDOR_ID_APPLE 0x106b +#define PCI_DEVICE_ID_APPLE_343S1201 0x0010 +#define PCI_DEVICE_ID_APPLE_343S1211 0x0017 +#define PCI_DEVICE_ID_APPLE_UNI_N_I_PCI 0x001e +#define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f +#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 +#define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 +#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b + +#define PCI_VENDOR_ID_SUN 0x108e +#define PCI_DEVICE_ID_SUN_EBUS 0x1000 +#define PCI_DEVICE_ID_SUN_SIMBA 0x5000 +#define PCI_DEVICE_ID_SUN_PBM 0x8000 +#define PCI_DEVICE_ID_SUN_SABRE 0xa000 + +#define PCI_VENDOR_ID_CMD 0x1095 +#define PCI_DEVICE_ID_CMD_646 0x0646 + +#define PCI_VENDOR_ID_REALTEK 0x10ec +#define PCI_DEVICE_ID_REALTEK_RTL8029 0x8029 + +#define PCI_VENDOR_ID_QEMU 0x1234 +#define PCI_DEVICE_ID_QEMU_VGA 0x1111 + +#define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_82441 0x1237 + +#endif /* _H_PCI */ Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 16:19:41 2010 (r692) @@ -18,7 +18,7 @@ #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "video_subr.h" typedef struct osi_fb_info {
1
0
0
0
[commit] r691 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 arch/x86/xbox drivers fs fs/ext2 f...
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 16:05:53 2010 New Revision: 691 URL:
http://tracker.coreboot.org/trac/openbios/changeset/691
Log: Move the libopenbios header files into include/libopenbios to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/ trunk/openbios-devel/include/libopenbios/bindings.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/include/libopenbios/elfload.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/elfload.h trunk/openbios-devel/include/libopenbios/fontdata.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/fontdata.h trunk/openbios-devel/include/libopenbios/ipchecksum.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/ipchecksum.h trunk/openbios-devel/include/libopenbios/of.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/of.h trunk/openbios-devel/include/libopenbios/ofmem.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/ofmem.h Deleted: trunk/openbios-devel/include/ipchecksum.h trunk/openbios-devel/include/ofmem.h trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/include/openbios/elfload.h trunk/openbios-devel/include/openbios/fontdata.h trunk/openbios-devel/include/openbios/of.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/briq/tree.c trunk/openbios-devel/arch/ppc/briq/vfd.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/console.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/osi-blk.c trunk/openbios-devel/arch/ppc/mol/osi-scsi.c trunk/openbios-devel/arch/ppc/mol/pseudodisk.c trunk/openbios-devel/arch/ppc/mol/tree.c trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/pearpc/console.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/pearpc/tree.c trunk/openbios-devel/arch/ppc/pearpc/vfd.c trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/ppc/qemu/vfd.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/blk.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/exception.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/xbox/console.c trunk/openbios-devel/arch/x86/xbox/methods.c trunk/openbios-devel/drivers/adb_bus.c trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/adb_mouse.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/fs/ext2/ext2_utils.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c trunk/openbios-devel/fs/iso9660/iso9660_read.c trunk/openbios-devel/fs/iso9660/iso9660_readdir.c trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libc/extra.c trunk/openbios-devel/libopenbios/bindings.c trunk/openbios-devel/libopenbios/client.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/font_8x16.c trunk/openbios-devel/libopenbios/font_8x8.c trunk/openbios-devel/libopenbios/ipchecksum.c trunk/openbios-devel/libopenbios/linuxbios.c trunk/openbios-devel/libopenbios/ofmem_common.c trunk/openbios-devel/packages/bootinfo-loader.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/deblocker.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c trunk/openbios-devel/packages/video.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #define printf printk #define debug printk Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "segment.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,10 +20,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" extern void unexpected_excep( int vector ); Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,13 +17,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" static void transfer_control_to_elf( ulong entry ) Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,10 +19,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/ppc/briq/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" void devtree_init( void ) { Modified: trunk/openbios-devel/arch/ppc/briq/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "briq/briq.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,7 +19,7 @@ #include "openbios/config.h" #include "dict.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/mol/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,10 +16,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "osi_calls.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/mol.h" #include "boothelper_sh.h" #include "video_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,10 +16,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "openbios-version.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,13 +16,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "osi_calls.h" #include "ablk_sh.h" #include "boothelper_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,10 +15,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "osi_calls.h" #include "kbd_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-blk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-scsi.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "scsi_sh.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/pseudodisk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,10 +15,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "osi_calls.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 16:05:53 2010 (r691) @@ -18,9 +18,9 @@ /* TODO: Clean up MOLisms in a decent way */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "kernel.h" #ifdef I_WANT_MOLISMS #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,9 +13,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -21,10 +21,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" extern void unexpected_excep( int vector ); Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,13 +17,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" static void transfer_control_to_elf( ulong entry ) Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,10 +19,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/ppc/pearpc/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" void devtree_init( void ) { Modified: trunk/openbios-devel/arch/ppc/pearpc/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "pearpc/pearpc.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -12,7 +12,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -21,12 +21,12 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "openbios/nvram.h" #include "openbios/drivers.h" #include "qemu/qemu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ #include "qemu-dict.h" #include "openbios/config.h" #include "dict.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,13 +15,13 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "kernel.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,11 +19,11 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/string.h" #include "qemu/qemu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "arch/ppc/processor.h" /************************************************************************/ Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,9 +16,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "kernel.h" #include "mmutypes.h" #include "asm/processor.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,7 +19,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "qemu/qemu.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "openbios/drivers.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,8 +8,8 @@ */ #include "libc/vsprintf.h" -#include "openbios/bindings.h" -#include "ofmem.h" +#include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" #include "asm/asi.h" #include "pgtsrmmu.h" #include "openprom.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "openprom.h" #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,10 +6,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/drivers.h" -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 16:05:53 2010 (r691) @@ -4,7 +4,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "libc/vsprintf.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "spitfire.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "ofmem_sparc64.h" #include "spitfire.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ #ifndef _H_OFMEM_SPARC64 #define _H_OFMEM_SPARC64 -#include "ofmem.h" +#include "libopenbios/ofmem.h" extern void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "dict.h" #include "openbios/nvram.h" @@ -20,7 +20,7 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/unix/blk.c ============================================================================== --- trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 16:05:53 2010 (r691) @@ -12,7 +12,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "blk.h" typedef struct { Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 16:05:53 2010 (r691) @@ -31,11 +31,11 @@ #include "dict.h" #include "kernel/stack.h" #include "arch/unix/plugins.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios-version.h" #include "blk.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define MEMORY_SIZE (4*1024*1024) /* 4M ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256k for the dictionary */ Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,8 +8,8 @@ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/exception.c ============================================================================== --- trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "segment.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/x86/xbox/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,7 +11,7 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" typedef struct osi_fb_info { Modified: trunk/openbios-devel/arch/x86/xbox/methods.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,9 +19,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -// #include "ofmem.h" +// #include "libopenbios/ofmem.h" /************************************************************************/ /* stdout */ Modified: trunk/openbios-devel/drivers/adb_bus.c ============================================================================== --- trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/vsprintf.h" #include "adb_bus.h" Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "kbd.h" Modified: trunk/openbios-devel/drivers/adb_mouse.c ============================================================================== --- trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,9 +1,9 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "escc.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" @@ -24,7 +24,7 @@ #include "scsi.h" #include "asm/dma.h" #include "esp.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define BUFSIZE 4096 Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,7 +1,7 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:05:53 2010 (r691) @@ -5,10 +5,10 @@ ** This code is licensed under GNU General Public License. **/ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "iommu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #ifdef CONFIG_DEBUG_IOMMU #define DPRINTF(fmt, args...) \ Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "openbios/nvram.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,14 +11,14 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" #include "openbios/nvram.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "obio.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,7 +16,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/pci.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,12 +11,12 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:05:53 2010 (r691) @@ -18,14 +18,14 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "openbios/drivers.h" -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 Modified: trunk/openbios-devel/fs/ext2/ext2_utils.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "libext2.h" #include "ext2_utils.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "filesys.h" #include "glue.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" #include "os.h" Modified: trunk/openbios-devel/fs/iso9660/iso9660_mount.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer) Modified: trunk/openbios-devel/fs/iso9660/iso9660_read.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_read.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_read.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" size_t iso9660_read(iso9660_FILE *_file, char *buf, size_t count) Modified: trunk/openbios-devel/fs/iso9660/iso9660_readdir.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_readdir.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_readdir.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #define offsetof(t,m) ((long)&(((t *)0)->m)) Copied: trunk/openbios-devel/include/libopenbios/bindings.h (from r689, trunk/openbios-devel/include/openbios/bindings.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/bindings.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/bindings.h) @@ -0,0 +1,150 @@ +/* + * Creation Date: <2003/12/19 23:09:56 samuel> + * Time-stamp: <2004/01/07 19:36:42 samuel> + * + * <bindings.h> + * + * Forth bindings + * + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_BINDINGS +#define _H_BINDINGS + +#include "kernel/stack.h" +#include "kernel/kernel.h" + +#define PUSH3(a,b,c) do { PUSH((a)); PUSH((b)); PUSH((c)); } while(0) +#define PUSH2(a,b) do { PUSH((a)); PUSH((b)); } while(0) +#define RET( v ) do { PUSH(v); return; } while(0) + +/* initialization */ +extern int initialize_forth( void ); + +/* panic */ +extern int forth_segv_handler( char *segv_addr ); + +/* active package */ +extern phandle_t find_dev( const char *path ); +extern phandle_t get_cur_dev( void ); +extern phandle_t activate_device( const char *str ); +extern void device_end( void ); +extern void activate_dev( phandle_t ph ); + + +/* ihandle related */ +extern phandle_t ih_to_phandle( ihandle_t ih ); +extern ihandle_t my_parent( void ); +extern ihandle_t my_self( void ); +extern char *my_args_copy( void ); + +extern xt_t find_package_method( const char *meth, phandle_t ph ); +extern xt_t find_ih_method( const char *method, ihandle_t ih ); +extern xt_t find_parent_method( const char *method ); +extern void call_package( xt_t xt, ihandle_t ihandle ); +extern void call_parent( xt_t xt ); +extern void call_parent_method( const char *method ); + +/* package */ +extern ihandle_t open_package( const char *argstr, phandle_t ph ); +extern ihandle_t open_dev( const char *spec ); +extern void close_package( ihandle_t ih ); +extern void close_dev( ihandle_t ih ); + +/* property access */ +extern void set_property( phandle_t ph, const char *name, + const char *buf, int len ); +extern void set_int_property( phandle_t ph, const char *name, + u32 val ); +extern u32 get_int_property( phandle_t ph, const char *name, + int *retlen ); +extern char *get_property( phandle_t ph, const char *name, + int *retlen ); + +/* device tree iteration */ +extern phandle_t dt_iter_begin( void ); +extern phandle_t dt_iterate( phandle_t last_tree ); +extern phandle_t dt_iterate_type( phandle_t last_tree, + const char *type ); +static inline phandle_t dt_find_type( const char *type ) { + return dt_iterate_type( 0, type ); +} + +/* forth bindings */ +extern cell feval( const char *str ); +extern void bind_xtfunc( const char *name, xt_t xt, + ucell arg, void (*func)(void) ); +extern void bind_func( const char *name, void (*func)(void) ); +extern xt_t bind_noname_func( void (*func)(void) ); +extern void push_str( const char *str ); +extern char *pop_fstr_copy( void ); + +extern int _fword( const char *word, xt_t *cache_xt ); +extern cell _eword( const char *word, xt_t *cache_xt, int nargs ); +extern int _selfword( const char *method, xt_t *cache_xt ); +extern int _parword( const char *method, xt_t *cache_xt ); + +#define fword(w) ({ static xt_t cache_xt = 0; _fword(w, &cache_xt); }) +#define eword(w, nargs) ({ static xt_t cache_xt = 0; _eword(w, &cache_xt, nargs); }) +#define selfword(w) ({ static xt_t cache_xt = 0; _selfword(w, &cache_xt); }) +#define parword(w) ({ static xt_t cache_xt = 0; _parword(w, &cache_xt); }) + +extern void throw( int error ); + + +/* node bindings */ +extern void make_openable( int only_parents ); + + +typedef struct { + const char *name; + void *func; +} method_t; + +#define REGISTER_NAMED_NODE( name, path ) do { \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define REGISTER_NODE_METHODS( name, path ) do { \ + const char *paths[1]; \ + \ + paths[0] = path; \ + bind_node( name##_flags_, name##_size_, \ + paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define DECLARE_UNNAMED_NODE( name, flags, size ) \ +static const int name##_flags_ = flags; \ +static const int name##_size_ = size; + +#define DECLARE_NODE( name, flags, size, paths... ) \ +static const char * const name##_p[] = { paths }; \ +DECLARE_UNNAMED_NODE(name, flags, size) + +#define NODE_METHODS( name ) \ +static const method_t name##_m[] + +#define REGISTER_NODE( name ) do { \ + bind_node( name##_flags_, name##_size_, \ + name##_p, sizeof(name##_p)/sizeof(char*), \ + name##_m, sizeof(name##_m)/sizeof(method_t) ); \ + } while(0) + +extern void bind_node( int flags, int size, const char * const *paths, int npaths, + const method_t *methods, int nmethods ); + +extern void bind_new_node( int flags, int size, const char *name, + const method_t *methods, int nmethods ); + +#define INSTALL_OPEN 1 /* install trivial open and close methods */ + + + +#endif /* _H_BINDINGS */ Copied: trunk/openbios-devel/include/libopenbios/elfload.h (from r689, trunk/openbios-devel/include/openbios/elfload.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/elfload.h) @@ -0,0 +1,29 @@ +/* + * Creation Date: <2001/05/05 16:44:17 samuel> + * Time-stamp: <2003/10/22 23:18:42 samuel> + * + * <elfload.h> + * + * Elf loader + * + * Copyright (C) 2001, 2003 Samuel Rydh (samuel(a)ibrium.se) + * + * 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 + * + */ + +#ifndef _H_ELFLOAD +#define _H_ELFLOAD + +#include "openbios/elf.h" +#include "asm/elf.h" + +extern int is_elf( int fd, int offs ); +extern int find_elf( int fd ); + +extern Elf32_Phdr * elf_readhdrs( int fd, int offs, Elf32_Ehdr *e ); + + +#endif /* _H_ELFLOAD */ Copied: trunk/openbios-devel/include/libopenbios/fontdata.h (from r689, trunk/openbios-devel/include/openbios/fontdata.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/fontdata.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/fontdata.h) @@ -0,0 +1,28 @@ +/* Font definitions */ + +#ifndef OPENBIOS_FONTDATA_H +#define OPENBIOS_FONTDATA_H + +#define FONTDATAMAX_8X8 2048 +#define FONT_WIDTH_8X8 8 +#define FONT_HEIGHT_8X8 8 + +extern const unsigned char fontdata_8x8[FONTDATAMAX_8X8]; + +#define FONTDATAMAX_8X16 4096 +#define FONT_WIDTH_8X16 8 +#define FONT_HEIGHT_8X16 16 + +extern const unsigned char fontdata_8x16[FONTDATAMAX_8X16]; + +#if defined(CONFIG_FONT_8X8) +#define fontdata fontdata_8x8 +#define FONT_HEIGHT FONT_HEIGHT_8X8 +#define FONT_WIDTH FONT_WIDTH_8X8 +#elif defined(CONFIG_FONT_8X16) +#define fontdata fontdata_8x16 +#define FONT_HEIGHT FONT_HEIGHT_8X16 +#define FONT_WIDTH FONT_WIDTH_8X16 +#endif + +#endif /* OPENBIOS_FONTDATA_H */ Copied: trunk/openbios-devel/include/libopenbios/ipchecksum.h (from r689, trunk/openbios-devel/include/ipchecksum.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/ipchecksum.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/ipchecksum.h) @@ -0,0 +1,7 @@ +#ifndef IPCHECKSUM_H +#define IPCHECKSUM_H + +unsigned short ipchksum(const void *data, unsigned long length); +unsigned short add_ipchksums(unsigned long offset, unsigned short sum, unsigned short new); + +#endif /* IPCHECKSUM_H */ Copied: trunk/openbios-devel/include/libopenbios/of.h (from r689, trunk/openbios-devel/include/openbios/of.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/of.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/of.h) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2004/01/07 19:19:18 samuel> + * Time-stamp: <2004/01/07 19:19:48 samuel> + * + * <of.h> + * + * OpenFirmware related defines + * + * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_OF +#define _H_OF + +extern int of_client_interface( int *params ); + +#endif /* _H_OF */ Copied: trunk/openbios-devel/include/libopenbios/ofmem.h (from r689, trunk/openbios-devel/include/ofmem.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/ofmem.h) @@ -0,0 +1,127 @@ +/* + * Creation Date: <1999/11/16 00:47:06 samuel> + * Time-stamp: <2003/10/18 13:28:14 samuel> + * + * <ofmem.h> + * + * + * + * Copyright (C) 1999, 2002 Samuel Rydh (samuel(a)ibrium.se) + * + * 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 + * + */ + +#ifndef _H_OFMEM +#define _H_OFMEM + +#include "kernel/stack.h" + +typedef struct alloc_desc { + struct alloc_desc *next; + ucell size; /* size (including) this struct */ +} alloc_desc_t; + +typedef struct mem_range { + struct mem_range *next; + ucell start; + ucell size; +} range_t; + +typedef struct trans { + struct trans *next; + ucell virt; /* chain is sorted by virt */ + ucell size; + ucell phys; + ucell mode; +} translation_t; + +/* ofmem private data */ +typedef struct { + ucell ramsize; + char *next_malloc; + alloc_desc_t *mfree; /* list of free malloc blocks */ + + range_t *phys_range; + range_t *virt_range; + + translation_t *trans; /* this is really a translation_t */ +} ofmem_t; + +/* TODO: temporary migration interface */ +extern ofmem_t* ofmem_arch_get_private(void); +extern void* ofmem_arch_get_malloc_base(void); +extern ucell ofmem_arch_get_heap_top(void); +extern ucell ofmem_arch_get_virt_top(void); +extern ucell ofmem_arch_default_translation_mode( ucell phys ); +extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, + ucell mode); +extern void ofmem_arch_unmap_pages(ucell virt, ucell size); +/* sparc64 uses this method */ +extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, + ucell mode ); + +/* malloc interface */ +extern void* ofmem_malloc( size_t size ); +extern void ofmem_free( void *ptr ); +extern void* ofmem_realloc( void *ptr, size_t size ); + +/* ofmem_common.c */ + +extern void ofmem_cleanup( void ); +extern void ofmem_init( void ); + +/* + * register /memory and /virtual-memory handles + * ofmem module will update "available" and "translations" properties + * using these handles + * + * to disable updating /memory properties pass zero memory handle + */ +extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); + +extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); +extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); +extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); + +extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); +extern int ofmem_unmap( ucell virt, ucell size ); + +extern void ofmem_release_phys( ucell phys, ucell size ); +extern void ofmem_release_virt( ucell virt, ucell size ); +extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); + +#ifdef CONFIG_PPC +#define PAGE_SHIFT 12 + +ulong get_ram_top( void ); +ulong get_ram_bottom( void ); + +#elif defined(CONFIG_SPARC32) +#define PAGE_SHIFT 12 + +/* arch/sparc32/lib.c */ +struct mem; +extern struct mem cdvmem; + +void mem_init(struct mem *t, char *begin, char *limit); +void *mem_alloc(struct mem *t, int size, int align); +int map_page(unsigned long va, uint64_t epa, int type); +void *map_io(uint64_t pa, int size); +#endif + +#ifdef PAGE_SHIFT +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE - 1)) +#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) +#endif + +#if defined(CONFIG_DEBUG_OFMEM) +# define OFMEM_TRACE(fmt, ...) do { printk("OFMEM: " fmt, ## __VA_ARGS__); } while (0) +#else +# define OFMEM_TRACE(fmt, ...) do {} while(0) +#endif + +#endif /* _H_OFMEM */ Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libc/diskio.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" typedef struct { Modified: trunk/openbios-devel/libc/extra.c ============================================================================== --- trunk/openbios-devel/libc/extra.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libc/extra.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "libc/string.h" #include "libc/vsprintf.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" /* strncpy without 0-pad */ char * Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "libc/stdlib.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/client.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,8 +15,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/of.h" +#include "libopenbios/bindings.h" +#include "libopenbios/of.h" /* Uncomment to enable debug printout of client interface calls */ //#define DEBUG_CIF Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,8 +13,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/fontdata.h" +#include "libopenbios/bindings.h" +#include "libopenbios/fontdata.h" #include "video_subr.h" #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -30,8 +30,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "libc/diskio.h" #include "openbios/elf.h" Modified: trunk/openbios-devel/libopenbios/elfnote.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,7 +3,7 @@ #include "elf_boot.h" #include "sys_info.h" #include "asm/io.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "openbios-version.h" #define printf printk #define debug printk Modified: trunk/openbios-devel/libopenbios/font_8x16.c ============================================================================== --- trunk/openbios-devel/libopenbios/font_8x16.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/font_8x16.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ * * **********************************************/ -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" const unsigned char fontdata_8x16[FONTDATAMAX_8X16] = { Modified: trunk/openbios-devel/libopenbios/font_8x8.c ============================================================================== --- trunk/openbios-devel/libopenbios/font_8x8.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/font_8x8.c Sun Mar 14 16:05:53 2010 (r691) @@ -4,7 +4,7 @@ /* */ /**********************************************/ -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" const unsigned char fontdata_8x8[FONTDATAMAX_8X8] = { Modified: trunk/openbios-devel/libopenbios/ipchecksum.c ============================================================================== --- trunk/openbios-devel/libopenbios/ipchecksum.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/ipchecksum.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,6 +1,6 @@ /* Taken from Etherboot */ -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" unsigned short ipchksum(const void *data, unsigned long length) { Modified: trunk/openbios-devel/libopenbios/linuxbios.c ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -5,7 +5,7 @@ #include "asm/types.h" #include "asm/io.h" #include "linuxbios.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "sys_info.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,8 +13,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "ofmem.h" +#include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" /* * define OFMEM_FILL_RANGE to claim any unclaimed virtual and Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "libc/vsprintf.h" //#define DEBUG_BOOTINFO Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/cmdline.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/packages/deblocker.c ============================================================================== --- trunk/openbios-devel/packages/deblocker.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/deblocker.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/disk-label.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mac-parts.h" #include "packages.h" Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,7 +16,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #ifdef CONFIG_DEBUG_NVRAM Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/drivers.h" #include "video_subr.h" Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/xcoff.h"
1
0
0
0
[commit] r690 - in trunk/openbios-devel: fs fs/ext2 fs/grubfs fs/hfs fs/hfsplus fs/iso9660 include/fs include/openbios packages
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 15:33:32 2010 New Revision: 690 URL:
http://tracker.coreboot.org/trac/openbios/changeset/690
Log: Move the fs header file into include/fs to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/fs/ trunk/openbios-devel/include/fs/fs.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/fs.h Deleted: trunk/openbios-devel/include/openbios/fs.h Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/packages/misc-files.c Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -8,7 +8,7 @@ #include "libext2.h" #include "ext2_utils.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" typedef struct { Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "filesys.h" #include "glue.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" #include "libhfs.h" Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libhfsp.h" #include "volume.h" #include "record.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:33:32 2010 (r690) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/diskio.h" #include "os.h" #include "hfs_mdb.h" Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -5,7 +5,7 @@ */ #include "libiso9660.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" typedef struct { Copied: trunk/openbios-devel/include/fs/fs.h (from r689, trunk/openbios-devel/include/openbios/fs.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/fs/fs.h Sun Mar 14 15:33:32 2010 (r690, copy of r689, trunk/openbios-devel/include/openbios/fs.h) @@ -0,0 +1,90 @@ +/* + * Creation Date: <2001/05/06 17:12:45 samuel> + * Time-stamp: <2003/10/22 11:43:45 samuel> + * + * <fs_loader.h> + * + * Generic file system access + * + * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) + * + * 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 + * + */ + +#ifndef _H_FS +#define _H_FS + + +typedef struct fs_ops fs_ops_t; +typedef struct opaque_struct file_desc_t; + +#define fs_open_path( fs, path ) (fs)->open_path( fs, path ) +#define fs_search_rom( fs ) (fs)->search_rom( fs ) +#define fs_search_file( fs, name ) (fs)->search_file( fs, name ) +#define fs_vol_name( fs, buf, size ) (fs)->vol_name( fs, buf, size ) + +struct fs_ops { + void *fs_data; + int fd; /* owner block device */ + int type; + + void (*close_fs)( fs_ops_t *fs ); + file_desc_t *(*open_path)( fs_ops_t *fs, const char *path ); + file_desc_t *(*search_rom)( fs_ops_t *fs ); + file_desc_t *(*search_file)( fs_ops_t *fs, const char *name ); + char *(*vol_name)( fs_ops_t *fs, char *buf, int size ); + + /* file ops */ + void (*close)( file_desc_t *file ); + int (*read)( file_desc_t *file, void *buf, size_t count ); + int (*lseek)( file_desc_t *file, off_t offset, int whence ); + char *(*get_path)( file_desc_t *file, char *buf, int len ); + void (*dir)( file_desc_t *file ); + + const char *(*get_fstype)( fs_ops_t *fs ); +}; + +extern fs_ops_t *fs_open( int fs_type, int fd ); +extern void fs_close( fs_ops_t *fs ); +const char *fs_get_name( fs_ops_t *fs ); + +#ifdef CONFIG_HFSP +extern int fs_hfsp_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_hfsp_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_HFS +extern int fs_hfs_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_hfs_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_ISO9660 +extern int fs_iso9660_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_EXT2 +extern int fs_ext2_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_ext2_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_GRUBFS +extern int fs_grubfs_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_grubfs_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + + + +/* misc */ +extern char *get_hfs_vol_name( int fd, char *buf, int size ); + + +#endif /* _H_FS */ Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:33:32 2010 (r690) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/diskio.h" #include "packages.h"
1
0
0
0
[commit] r689 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 drivers include include/kernel inc...
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 15:21:02 2010 New Revision: 689 URL:
http://tracker.coreboot.org/trac/openbios/changeset/689
Log: Move the kernel header files into include/kernel to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/kernel/ trunk/openbios-devel/include/kernel/kernel.h (contents, props changed) - copied, changed from r686, trunk/openbios-devel/include/openbios/kernel.h trunk/openbios-devel/include/kernel/stack.h (props changed) - copied unchanged from r686, trunk/openbios-devel/include/openbios/stack.h Deleted: trunk/openbios-devel/include/openbios/kernel.h trunk/openbios-devel/include/openbios/stack.h Modified: trunk/openbios-devel/arch/amd64/console.c trunk/openbios-devel/arch/amd64/context.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/lib.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/loadfs.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/segment.c trunk/openbios-devel/arch/amd64/sys_info.c trunk/openbios-devel/arch/ppc/briq/briq.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/mol.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/loadfs.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/loadfs.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/console.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/lib.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/loadfs.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/ofmem.h trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/primitives.c trunk/openbios-devel/kernel/stack.c trunk/openbios-devel/packages/init.c Modified: trunk/openbios-devel/arch/amd64/console.c ============================================================================== --- trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/amd64/context.c ============================================================================== --- trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "segment.h" #include "context.h" Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/amd64/lib.c ============================================================================== --- trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include <stdarg.h> #include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" /* Format a string and print it on the screen, just like the libc * function printf. Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/amd64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 15:21:02 2010 (r689) @@ -10,8 +10,8 @@ #include "openbios/bindings.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "sys_info.h" #include "openbios.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/ppc/briq/briq.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 15:21:02 2010 (r689) @@ -20,8 +20,8 @@ #include "openbios/config.h" #include "dict.h" #include "openbios/bindings.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "libc/string.h" #include "kernel.h" Modified: trunk/openbios-devel/arch/ppc/mol/mol.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 15:21:02 2010 (r689) @@ -21,8 +21,8 @@ #include "openbios/config.h" #include "dict.h" #include "openbios/bindings.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "libc/string.h" #include "kernel.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "openbios/bindings.h" #include "openbios/drivers.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "a.out.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "context.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/sparc32/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 15:21:02 2010 (r689) @@ -11,8 +11,8 @@ #include "openbios/drivers.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "openbios/nvram.h" #include "../../drivers/timer.h" // XXX #include "sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "elf_boot.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "a.out.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "openbios/fontdata.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "context.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 15:21:02 2010 (r689) @@ -3,7 +3,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/sparc64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "elf_boot.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 15:21:02 2010 (r689) @@ -27,9 +27,9 @@ #include "openbios/sysinclude.h" #include "mconfig.h" #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "arch/unix/plugins.h" #include "openbios/bindings.h" #include "openbios-version.h" Modified: trunk/openbios-devel/arch/x86/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/console.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/console.c Sun Mar 14 15:21:02 2010 (r689) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "segment.h" #include "context.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/lib.c ============================================================================== --- trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include <stdarg.h> #include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" /* Format a string and print it on the screen, just like the libc * function printf. Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 15:21:02 2010 (r689) @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 15:21:02 2010 (r689) @@ -10,8 +10,8 @@ #include "openbios/bindings.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "openbios/drivers.h" #include "openbios/pci.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 15:21:02 2010 (r689) @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "relocate.h" #include "segment.h" Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "context.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 15:21:02 2010 (r689) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 15:21:02 2010 (r689) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 15:21:02 2010 (r689) @@ -12,7 +12,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "openbios/pci.h" #include "openbios/drivers.h" Copied and modified: trunk/openbios-devel/include/kernel/kernel.h (from r686, trunk/openbios-devel/include/openbios/kernel.h) ============================================================================== --- trunk/openbios-devel/include/openbios/kernel.h Sat Mar 13 13:44:22 2010 (r686, copy source) +++ trunk/openbios-devel/include/kernel/kernel.h Sun Mar 14 15:21:02 2010 (r689) @@ -18,7 +18,7 @@ #ifndef _H_KERNEL #define _H_KERNEL -#include "openbios/stack.h" +#include "kernel/stack.h" #include "asm/io.h" /* Interrupt status */ Copied: trunk/openbios-devel/include/kernel/stack.h (from r686, trunk/openbios-devel/include/openbios/stack.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/kernel/stack.h Sun Mar 14 15:21:02 2010 (r689, copy of r686, trunk/openbios-devel/include/openbios/stack.h) @@ -0,0 +1,104 @@ +/* stack.h + * tag: stack and stack access functions + * + * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer + * + * See the file "COPYING" for further information about + * the copyright and warranty status of this work. + */ + +#ifndef __STACK_H +#define __STACK_H + +#define dstacksize 512 +extern int dstackcnt; +extern cell dstack[dstacksize]; + +#define rstacksize 512 +extern int rstackcnt; +extern cell rstack[rstacksize]; + +extern int dbgrstackcnt; + +//typedef struct opaque_xt *xt_t; +//typedef struct opaque_ihandle *ihandle_t; +//typedef struct opaque_phandle *phandle_t; + +typedef ucell xt_t; +typedef ucell ihandle_t; +typedef ucell phandle_t; + + + + +static inline void PUSH(ucell value) { + dstack[++dstackcnt] = (value); +} +static inline void PUSH_xt( xt_t xt ) { PUSH( (ucell)xt ); } +static inline void PUSH_ih( ihandle_t ih ) { PUSH( (ucell)ih ); } +static inline void PUSH_ph( phandle_t ph ) { PUSH( (ucell)ph ); } + +static inline ucell POP(void) { + return (ucell) dstack[dstackcnt--]; +} +static inline xt_t POP_xt( void ) { return (xt_t)POP(); } +static inline ihandle_t POP_ih( void ) { return (ihandle_t)POP(); } +static inline phandle_t POP_ph( void ) { return (phandle_t)POP(); } + +static inline void DROP(void) { + dstackcnt--; +} + +static inline void DDROP(void) { + dstackcnt -= 2; +} + +static inline void DPUSH(ducell value) { +#ifdef NEED_FAKE_INT128_T + dstack[++dstackcnt] = (cell) value.lo; + dstack[++dstackcnt] = (cell) value.hi; +#else + dstack[++dstackcnt] = (cell) value; + dstack[++dstackcnt] = (cell) (value >> bitspercell); +#endif +} + +static inline ducell DPOP(void) { +#ifdef NEED_FAKE_INT128_T + ducell du; + du.hi = (ucell) dstack[dstackcnt--]; + du.lo = (ucell) dstack[dstackcnt--]; + return du; +#else + ducell du; + du = ((ducell)(ucell) dstack[dstackcnt--]) << bitspercell; + du |= (ucell) dstack[dstackcnt--]; + return du; +#endif +} + +static inline ucell GETTOS(void) { + return dstack[dstackcnt]; +} + +#define GETITEM(number) (dstack[dstackcnt - number]) +static inline void PUSHR(ucell value) { + rstack[++rstackcnt] = (value); +} + +static inline ucell POPR(void) { + return (ucell) rstack[rstackcnt--]; +} +static inline ucell GETTORS(void) { + return rstack[rstackcnt]; +} + + +#if defined(DEBUG_DSTACK) || defined(FCOMPILER) +void printdstack(void); +#endif +#if defined(DEBUG_RSTACK) || defined(FCOMPILER) +void printrstack(void); +#endif + +#endif Modified: trunk/openbios-devel/include/ofmem.h ============================================================================== --- trunk/openbios-devel/include/ofmem.h Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/include/ofmem.h Sun Mar 14 15:21:02 2010 (r689) @@ -17,7 +17,7 @@ #ifndef _H_OFMEM #define _H_OFMEM -#include "openbios/stack.h" +#include "kernel/stack.h" typedef struct alloc_desc { struct alloc_desc *next; Modified: trunk/openbios-devel/include/openbios/bindings.h ============================================================================== --- trunk/openbios-devel/include/openbios/bindings.h Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/include/openbios/bindings.h Sun Mar 14 15:21:02 2010 (r689) @@ -17,8 +17,8 @@ #ifndef _H_BINDINGS #define _H_BINDINGS -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #define PUSH3(a,b,c) do { PUSH((a)); PUSH((b)); PUSH((c)); } while(0) #define PUSH2(a,b) do { PUSH((a)); PUSH((b)); } while(0) Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 15:21:02 2010 (r689) @@ -22,9 +22,9 @@ #endif #include "openbios/config.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "openbios/sysinclude.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" #include "cross.h" #include "openbios-version.h" Modified: trunk/openbios-devel/kernel/dict.c ============================================================================== --- trunk/openbios-devel/kernel/dict.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/dict.c Sun Mar 14 15:21:02 2010 (r689) @@ -8,7 +8,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" #ifdef BOOTSTRAP #include <string.h> Modified: trunk/openbios-devel/kernel/primitives.c ============================================================================== --- trunk/openbios-devel/kernel/primitives.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/primitives.c Sun Mar 14 15:21:02 2010 (r689) @@ -8,8 +8,8 @@ #include "openbios/config.h" #include "openbios/sysinclude.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "dict.h" /* Modified: trunk/openbios-devel/kernel/stack.c ============================================================================== --- trunk/openbios-devel/kernel/stack.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/kernel/stack.c Sun Mar 14 15:21:02 2010 (r689) @@ -8,7 +8,7 @@ #include "openbios/config.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "cross.h" #define dstacksize 512 Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Mar 14 14:54:45 2010 (r688) +++ trunk/openbios-devel/packages/init.c Sun Mar 14 15:21:02 2010 (r689) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "packages.h" void
1
0
0
0
[commit] r688 - in trunk/openbios-devel: arch/ppc/qemu arch/unix include/arch/ppc include/arch/unix include/ppc include/unix
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 14:54:45 2010 New Revision: 688 URL:
http://tracker.coreboot.org/trac/openbios/changeset/688
Log: Finish move of architecture-specific header files, with modifications to the header paths as required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/ppc/ (props changed) - copied from r686, trunk/openbios-devel/include/ppc/ trunk/openbios-devel/include/arch/unix/ (props changed) - copied from r686, trunk/openbios-devel/include/unix/ Deleted: trunk/openbios-devel/include/ppc/ trunk/openbios-devel/include/unix/ Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/unix/unix.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 14:54:45 2010 (r688) @@ -32,7 +32,7 @@ #include "libc/vsprintf.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" -#include "ppc/processor.h" +#include "arch/ppc/processor.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 14:54:45 2010 (r688) @@ -24,7 +24,7 @@ #include "libc/string.h" #include "qemu/qemu.h" #include "ofmem.h" -#include "ppc/processor.h" +#include "arch/ppc/processor.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:54:45 2010 (r688) @@ -30,7 +30,7 @@ #include "openbios/kernel.h" #include "dict.h" #include "openbios/stack.h" -#include "unix/plugins.h" +#include "arch/unix/plugins.h" #include "openbios/bindings.h" #include "openbios-version.h"
1
0
0
0
[commit] r687 - in trunk/openbios-devel: config/scripts include/amd64 include/arch include/arch/amd64 include/arch/ia64 include/arch/sparc32 include/arch/sparc64 include/arch/x86 include/ia64 inclu...
by repository service
14 Mar '10
14 Mar '10
Author: mcayland Date: Sun Mar 14 14:47:44 2010 New Revision: 687 URL:
http://tracker.coreboot.org/trac/openbios/changeset/687
Log: Begin tidying up of header locations as described on the mailing list. Firstly we move all of the architecture-specific header files from include/$ARCH to include/arch/$ARCH. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/ trunk/openbios-devel/include/arch/amd64/ (props changed) - copied from r686, trunk/openbios-devel/include/amd64/ trunk/openbios-devel/include/arch/ia64/ (props changed) - copied from r686, trunk/openbios-devel/include/ia64/ trunk/openbios-devel/include/arch/sparc32/ (props changed) - copied from r686, trunk/openbios-devel/include/sparc32/ trunk/openbios-devel/include/arch/sparc64/ (props changed) - copied from r686, trunk/openbios-devel/include/sparc64/ trunk/openbios-devel/include/arch/x86/ (props changed) - copied from r686, trunk/openbios-devel/include/x86/ Deleted: trunk/openbios-devel/include/amd64/ trunk/openbios-devel/include/ia64/ trunk/openbios-devel/include/sparc32/ trunk/openbios-devel/include/sparc64/ trunk/openbios-devel/include/x86/ Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Mar 13 13:44:22 2010 (r686) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Mar 14 14:47:44 2010 (r687) @@ -190,9 +190,9 @@ mkdir -p $OBJDIR/host/include mkdir -p $OBJDIR/host/kernel mkdir -p $OBJDIR/forth - ln -s ../../../include/$ARCH $OBJDIR/target/include/asm + ln -s ../../../include/arch/$ARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead - #ln -s ../../../include/$HOSTARCH $OBJDIR/host/include/asm + #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm echo "ok." cd $OBJDIR
1
0
0
0
← Newer
1
2
3
4
5
6
Older →
Jump to page:
1
2
3
4
5
6
Results per page:
10
25
50
100
200