diff options
| -rw-r--r-- | com32/Makefile | 1 | ||||
| -rw-r--r-- | com32/gplinclude/cpuid.h (renamed from com32/include/cpuid.h) | 37 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi.h (renamed from com32/include/dmi/dmi.h) | 0 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi_base_board.h (renamed from com32/include/dmi/dmi_base_board.h) | 0 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi_battery.h (renamed from com32/include/dmi/dmi_battery.h) | 0 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi_bios.h (renamed from com32/include/dmi/dmi_bios.h) | 0 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi_chassis.h (renamed from com32/include/dmi/dmi_chassis.h) | 0 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi_memory.h (renamed from com32/include/dmi/dmi_memory.h) | 0 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi_processor.h (renamed from com32/include/dmi/dmi_processor.h) | 0 | ||||
| -rw-r--r-- | com32/gplinclude/dmi/dmi_system.h (renamed from com32/include/dmi/dmi_system.h) | 0 | ||||
| -rw-r--r-- | com32/gpllib/Makefile | 4 | ||||
| -rw-r--r-- | com32/gpllib/cpuid.c (renamed from com32/modules/cpuid.c) | 39 | ||||
| -rw-r--r-- | com32/gpllib/dmi/dmi.c (renamed from com32/lib/dmi/dmi.c) | 0 | ||||
| -rw-r--r-- | com32/gpllib/dmi/dmi_base_board.c | 38 | ||||
| -rw-r--r-- | com32/gpllib/dmi/dmi_battery.c (renamed from com32/lib/dmi/dmi_battery.c) | 39 | ||||
| -rw-r--r-- | com32/gpllib/dmi/dmi_bios.c (renamed from com32/lib/dmi/dmi_bios.c) | 39 | ||||
| -rw-r--r-- | com32/gpllib/dmi/dmi_chassis.c (renamed from com32/lib/dmi/dmi_chassis.c) | 39 | ||||
| -rw-r--r-- | com32/gpllib/dmi/dmi_memory.c (renamed from com32/lib/dmi/dmi_memory.c) | 39 | ||||
| -rw-r--r-- | com32/gpllib/dmi/dmi_processor.c (renamed from com32/lib/dmi/dmi_processor.c) | 39 | ||||
| -rw-r--r-- | com32/hdt/Makefile | 8 | ||||
| -rw-r--r-- | com32/lib/Makefile | 3 | ||||
| -rw-r--r-- | com32/lib/dmi/dmi_base_board.c | 37 | ||||
| -rw-r--r-- | com32/modules/Makefile | 8 |
23 files changed, 181 insertions, 189 deletions
diff --git a/com32/Makefile b/com32/Makefile index 56a31882..64049d07 100644 --- a/com32/Makefile +++ b/com32/Makefile @@ -1,4 +1,3 @@ SUBDIRS = lib gpllib libutil modules menu samples rosh cmenu hdt - all tidy dist clean spotless install: set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done diff --git a/com32/include/cpuid.h b/com32/gplinclude/cpuid.h index f8e56447..e0ae72af 100644 --- a/com32/include/cpuid.h +++ b/com32/gplinclude/cpuid.h @@ -1,29 +1,20 @@ -/* ----------------------------------------------------------------------- * - * - * Copyright 2006 Erwan Velu - All Rights Reserved - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: +/* + * Portions of this file taken from the Linux kernel, + * Copyright 1991-2009 Linus Torvalds and contributors * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * - * ----------------------------------------------------------------------- */ +*/ #ifndef _CPUID_H #define _CPUID_H diff --git a/com32/include/dmi/dmi.h b/com32/gplinclude/dmi/dmi.h index 924ed420..924ed420 100644 --- a/com32/include/dmi/dmi.h +++ b/com32/gplinclude/dmi/dmi.h diff --git a/com32/include/dmi/dmi_base_board.h b/com32/gplinclude/dmi/dmi_base_board.h index 5b92b848..5b92b848 100644 --- a/com32/include/dmi/dmi_base_board.h +++ b/com32/gplinclude/dmi/dmi_base_board.h diff --git a/com32/include/dmi/dmi_battery.h b/com32/gplinclude/dmi/dmi_battery.h index 72c19693..72c19693 100644 --- a/com32/include/dmi/dmi_battery.h +++ b/com32/gplinclude/dmi/dmi_battery.h diff --git a/com32/include/dmi/dmi_bios.h b/com32/gplinclude/dmi/dmi_bios.h index 546bbefc..546bbefc 100644 --- a/com32/include/dmi/dmi_bios.h +++ b/com32/gplinclude/dmi/dmi_bios.h diff --git a/com32/include/dmi/dmi_chassis.h b/com32/gplinclude/dmi/dmi_chassis.h index 96711ed4..96711ed4 100644 --- a/com32/include/dmi/dmi_chassis.h +++ b/com32/gplinclude/dmi/dmi_chassis.h diff --git a/com32/include/dmi/dmi_memory.h b/com32/gplinclude/dmi/dmi_memory.h index 2b744b5c..2b744b5c 100644 --- a/com32/include/dmi/dmi_memory.h +++ b/com32/gplinclude/dmi/dmi_memory.h diff --git a/com32/include/dmi/dmi_processor.h b/com32/gplinclude/dmi/dmi_processor.h index 79ee43d4..79ee43d4 100644 --- a/com32/include/dmi/dmi_processor.h +++ b/com32/gplinclude/dmi/dmi_processor.h diff --git a/com32/include/dmi/dmi_system.h b/com32/gplinclude/dmi/dmi_system.h index 5a461d5f..5a461d5f 100644 --- a/com32/include/dmi/dmi_system.h +++ b/com32/gplinclude/dmi/dmi_system.h diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile index 0f8bf95c..08164c2a 100644 --- a/com32/gpllib/Makefile +++ b/com32/gpllib/Makefile @@ -8,7 +8,9 @@ include ../lib/MCONFIG REQFLAGS += -I../gplinclude -LIBOBJS = +LIBOBJS = dmi/dmi_battery.o dmi/dmi_chassis.o dmi/dmi_memory.o \ + dmi/dmi_processor.o dmi/dmi.o dmi/dmi_bios.o dmi/dmi_base_board.o \ + cpuid.o BINDIR = /usr/bin LIBDIR = /usr/lib diff --git a/com32/modules/cpuid.c b/com32/gpllib/cpuid.c index 4d6d46e4..ed3224d4 100644 --- a/com32/modules/cpuid.c +++ b/com32/gpllib/cpuid.c @@ -1,29 +1,20 @@ -/* ----------------------------------------------------------------------- * - * - * Copyright 2006 Erwan Velu - All Rights Reserved - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. +/* + * Portions of this file taken from the Linux kernel, + * Copyright 1991-2009 Linus Torvalds and contributors * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * ----------------------------------------------------------------------- */ + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include <stdio.h> #include <string.h> diff --git a/com32/lib/dmi/dmi.c b/com32/gpllib/dmi/dmi.c index a2a08b56..a2a08b56 100644 --- a/com32/lib/dmi/dmi.c +++ b/com32/gpllib/dmi/dmi.c diff --git a/com32/gpllib/dmi/dmi_base_board.c b/com32/gpllib/dmi/dmi_base_board.c new file mode 100644 index 00000000..f37feec9 --- /dev/null +++ b/com32/gpllib/dmi/dmi_base_board.c @@ -0,0 +1,38 @@ +/* ----------------------------------------------------------------------- * + * + * Pportions of this file taken from the dmidecode project + * + * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> + * Copyright (C) 2002-2008 Jean Delvare <khali@linux-fr.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For the avoidance of doubt the "preferred form" of this code is one which + * is in an open unpatent encumbered format. Where cryptographic key signing + * forms part of the process of creating an executable the information + * including keys needed to generate an equivalently functional executable + * are deemed to be part of the source code. +*/ + +#include <dmi/dmi.h> +#include <stdio.h> +const char *base_board_features_strings[]={ + "Board is a hosting board", /* 0 */ + "Board requires at least one daughter board", + "Board is removable", + "Board is replaceable", + "Board is hot swappable" /* 4 */ +}; + diff --git a/com32/lib/dmi/dmi_battery.c b/com32/gpllib/dmi/dmi_battery.c index 795fdfab..567254a8 100644 --- a/com32/lib/dmi/dmi_battery.c +++ b/com32/gpllib/dmi/dmi_battery.c @@ -1,28 +1,29 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2009 Erwan Velu - All Rights Reserved + * Pportions of this file taken from the dmidecode project * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: + * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> + * Copyright (C) 2002-2008 Jean Delvare <khali@linux-fr.org> * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For the avoidance of doubt the "preferred form" of this code is one which + * is in an open unpatent encumbered format. Where cryptographic key signing + * forms part of the process of creating an executable the information + * including keys needed to generate an equivalently functional executable + * are deemed to be part of the source code. */ #include <dmi/dmi.h> diff --git a/com32/lib/dmi/dmi_bios.c b/com32/gpllib/dmi/dmi_bios.c index 1e281be1..9458d492 100644 --- a/com32/lib/dmi/dmi_bios.c +++ b/com32/gpllib/dmi/dmi_bios.c @@ -1,28 +1,29 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2009 Erwan Velu - All Rights Reserved + * Pportions of this file taken from the dmidecode project * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: + * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> + * Copyright (C) 2002-2008 Jean Delvare <khali@linux-fr.org> * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For the avoidance of doubt the "preferred form" of this code is one which + * is in an open unpatent encumbered format. Where cryptographic key signing + * forms part of the process of creating an executable the information + * including keys needed to generate an equivalently functional executable + * are deemed to be part of the source code. */ #include <dmi/dmi.h> diff --git a/com32/lib/dmi/dmi_chassis.c b/com32/gpllib/dmi/dmi_chassis.c index 8cf3bf17..6150016f 100644 --- a/com32/lib/dmi/dmi_chassis.c +++ b/com32/gpllib/dmi/dmi_chassis.c @@ -1,28 +1,29 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2009 Erwan Velu - All Rights Reserved + * Pportions of this file taken from the dmidecode project * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: + * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> + * Copyright (C) 2002-2008 Jean Delvare <khali@linux-fr.org> * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For the avoidance of doubt the "preferred form" of this code is one which + * is in an open unpatent encumbered format. Where cryptographic key signing + * forms part of the process of creating an executable the information + * including keys needed to generate an equivalently functional executable + * are deemed to be part of the source code. */ #include <dmi/dmi.h> diff --git a/com32/lib/dmi/dmi_memory.c b/com32/gpllib/dmi/dmi_memory.c index 86cc19dc..dc354df1 100644 --- a/com32/lib/dmi/dmi_memory.c +++ b/com32/gpllib/dmi/dmi_memory.c @@ -1,28 +1,29 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2009 Erwan Velu - All Rights Reserved + * Pportions of this file taken from the dmidecode project * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: + * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> + * Copyright (C) 2002-2008 Jean Delvare <khali@linux-fr.org> * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For the avoidance of doubt the "preferred form" of this code is one which + * is in an open unpatent encumbered format. Where cryptographic key signing + * forms part of the process of creating an executable the information + * including keys needed to generate an equivalently functional executable + * are deemed to be part of the source code. */ #include <dmi/dmi.h> diff --git a/com32/lib/dmi/dmi_processor.c b/com32/gpllib/dmi/dmi_processor.c index 69606b06..f86f0095 100644 --- a/com32/lib/dmi/dmi_processor.c +++ b/com32/gpllib/dmi/dmi_processor.c @@ -1,28 +1,29 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2009 Erwan Velu - All Rights Reserved + * Pportions of this file taken from the dmidecode project * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: + * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> + * Copyright (C) 2002-2008 Jean Delvare <khali@linux-fr.org> * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * For the avoidance of doubt the "preferred form" of this code is one which + * is in an open unpatent encumbered format. Where cryptographic key signing + * forms part of the process of creating an executable the information + * including keys needed to generate an equivalently functional executable + * are deemed to be part of the source code. */ #include <dmi/dmi.h> diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile index 653f2c93..58715071 100644 --- a/com32/hdt/Makefile +++ b/com32/hdt/Makefile @@ -17,14 +17,17 @@ topdir = ../.. include $(topdir)/MCONFIG.embedded -INCLUDES = -I$(com32)/include -I$(com32)/cmenu/libmenu +INCLUDES = -I$(com32)/include -I$(com32)/cmenu/libmenu -I$(com32)/gplinclude LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc) LIB = liboldcom32.a com32 = $(topdir)/com32 LIBS = $(LIB) $(com32)/cmenu/libmenu/libmenu.a \ - $(com32)/libutil/libutil_com.a $(com32)/lib/libcom32.a $(LIBGCC) + $(com32)/gpllib/libcom32gpl.a \ + $(com32)/libutil/libutil_com.a $(com32)/lib/libcom32.a \ + $(LIBGCC) + LDFLAGS = -m elf_i386 -T $(com32)/lib/com32.ld all: hdt.c32 $(LIB) @@ -48,7 +51,6 @@ hdt.elf: hdt.o hdt-ata.o hdt-menu.o hdt-menu-pci.o hdt-menu-kernel.o \ hdt-cli-cpu.o hdt-cli-pxe.o hdt-cli-kernel.o \ hdt-cli-syslinux.o \ hdt-menu-pxe.o hdt-menu-summary.o\ - $(com32)/modules/cpuid.o \ $(LIBS) $(LD) $(LDFLAGS) -o $@ $^ diff --git a/com32/lib/Makefile b/com32/lib/Makefile index 0042c864..6f759e0c 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -63,9 +63,6 @@ LIBOBJS = \ pci/readb.o pci/readw.o pci/readl.o pci/readbios.o \ pci/writeb.o pci/writew.o pci/writel.o pci/writebios.o \ \ - dmi/dmi_battery.o dmi/dmi_chassis.o dmi/dmi_memory.o \ - dmi/dmi_processor.o dmi/dmi.o dmi/dmi_bios.o dmi/dmi_base_board.o \ - \ zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/gzio.o \ zlib/uncompr.o zlib/deflate.o zlib/trees.o zlib/zutil.o \ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/inffast.o \ diff --git a/com32/lib/dmi/dmi_base_board.c b/com32/lib/dmi/dmi_base_board.c deleted file mode 100644 index 18250a24..00000000 --- a/com32/lib/dmi/dmi_base_board.c +++ /dev/null @@ -1,37 +0,0 @@ -/* ----------------------------------------------------------------------- * - * - * Copyright 2009 Erwan Velu - All Rights Reserved - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * -*/ - -#include <dmi/dmi.h> -#include <stdio.h> -const char *base_board_features_strings[]={ - "Board is a hosting board", /* 0 */ - "Board requires at least one daughter board", - "Board is removable", - "Board is replaceable", - "Board is hot swappable" /* 4 */ -}; - diff --git a/com32/modules/Makefile b/com32/modules/Makefile index ec58829d..5a8a88c4 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -29,10 +29,14 @@ all: $(MODULES) $(TESTFILES) pcitest.elf : pcitest.o $(LIBS) $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ -cpuidtest.elf : cpuidtest.o cpuid.o $(LIBS) $(C_LIBS) +cpuidtest.elf : cpuidtest.o $(GPLLIB) $(LIBS) $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ -dmitest.elf : dmitest.o dmi_utils.o $(LIBS) $(C_LIBS) +.PRECIOUS: %.o +dmitest.o: dmitest.c + $(CC) $(CFLAGS) $(GPLINCLUDE) -c -o $@ $< + +dmitest.elf : dmi_utils.o dmitest.o $(GPLLIB) $(LIBS) $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ ethersel.elf : ethersel.o $(LIBS) $(C_LIBS) |