[freeldr] Move custom.c, drivemap.c/h, miscboot.c/h to i386 directories

[reactos.git] / reactos / boot / freeldr / freeldr / arch / i386 / i386vid.c

diff --git a/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c b/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
index b5426ea..9584d65 100644 (file)
--- a/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
@@ -1,9 +1,6 @@
 /*
  *  FreeLoader
  *  Copyright (C) 1998-2003  Brian Palmer  <brianp@sginet.com>
- *  Portions from Linux video.S - Display adapter & video mode setup, version 2.13 (14-May-99)
- *  Copyright (C) 1995 -- 1999 Martin Mares <mj@ucw.cz>
- *  Based on the original setup.S code (C) Linus Torvalds and Mats Anderson
  *
  *  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
@@ -15,9 +12,9 @@
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  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 <freeldr.h>
@@ -25,12 +22,7 @@
 #define NDEBUG
 #include <debug.h>
 
-/* non-standard specifier from windef.h -- please deprecate */
-#undef PACKED
-#ifdef __GNUC__
-#define PACKED __attribute__((packed))
-#endif
-
+#include <pshpack2.h>
 typedef struct
 {
        UCHAR   Signature[4];                           // (ret) signature ("VESA")
@@ -58,7 +50,8 @@ typedef struct
                                                                        // accelerated video modes (list of words terminated with FFFFh)
        UCHAR   Reserved[216];                          // reserved for VBE implementation
        UCHAR   ScratchPad[256];                        // OEM scratchpad (for OEM strings, etc.)
-} PACKED VESA_SVGA_INFO, *PVESA_SVGA_INFO;
+} VESA_SVGA_INFO, *PVESA_SVGA_INFO;
+#include <poppack.h>
 
 // Bitfields for VESA capabilities:
 //
@@ -244,7 +237,5 @@ USHORT BiosIsVesaSupported(VOID)
        //      }
        //}
 
-       DPRINTM(DPRINT_UI, "\n");
-
        return SvgaInfo->VesaVersion;
 }