aboutsummaryrefslogtreecommitdiffstats
path: root/sample
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:37 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:37 -0700
commit26c93df03a8a8c2c0fb130d3e890ce507994566d (patch)
tree3bcaa5d1772b05e0c8931575bd48d49b3386a01d /sample
parent34c6099d7e25993e92557646b2dab6a9df20fe02 (diff)
downloadsyslinux-26c93df03a8a8c2c0fb130d3e890ce507994566d.tar.gz
syslinux-26c93df03a8a8c2c0fb130d3e890ce507994566d.tar.xz
syslinux-26c93df03a8a8c2c0fb130d3e890ce507994566d.zip
Run Nindent on sample/mdiskchk.c
Automatically reformat sample/mdiskchk.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'sample')
-rw-r--r--sample/mdiskchk.c202
1 files changed, 100 insertions, 102 deletions
diff --git a/sample/mdiskchk.c b/sample/mdiskchk.c
index e7ebcde3..eec5be40 100644
--- a/sample/mdiskchk.c
+++ b/sample/mdiskchk.c
@@ -25,124 +25,122 @@
#include <string.h>
#include <i86.h> /* For MK_FP() */
-typedef unsigned long uint32_t;
+typedef unsigned long uint32_t;
typedef unsigned short uint16_t;
-typedef unsigned char uint8_t;
+typedef unsigned char uint8_t;
struct memdiskinfo {
- uint16_t bytes; /* Bytes from memdisk */
- uint16_t version; /* Memdisk version */
- uint32_t base; /* Base of disk in high memory */
- uint32_t size; /* Size of disk in sectors */
- char far * cmdline; /* Command line */
- void far * oldint13; /* Old INT 13h */
- void far * oldint15; /* Old INT 15h */
- uint16_t olddosmem;
- uint8_t bootloaderid;
-
- uint8_t _pad;
-
- /* We add our own fields at the end */
- int cylinders;
- int heads;
- int sectors;
+ uint16_t bytes; /* Bytes from memdisk */
+ uint16_t version; /* Memdisk version */
+ uint32_t base; /* Base of disk in high memory */
+ uint32_t size; /* Size of disk in sectors */
+ char far *cmdline; /* Command line */
+ void far *oldint13; /* Old INT 13h */
+ void far *oldint15; /* Old INT 15h */
+ uint16_t olddosmem;
+ uint8_t bootloaderid;
+
+ uint8_t _pad;
+
+ /* We add our own fields at the end */
+ int cylinders;
+ int heads;
+ int sectors;
};
-struct memdiskinfo * query_memdisk(int drive)
+struct memdiskinfo *query_memdisk(int drive)
{
- static struct memdiskinfo mm;
- uint32_t _eax, _ebx, _ecx, _edx;
- uint16_t _es, _di;
- unsigned char _dl = drive;
- uint16_t bytes;
-
- __asm {
- .386 ;
- mov eax, 454d0800h ;
- mov ecx, 444d0000h ;
- mov edx, 53490000h ;
- mov dl, _dl ;
- mov ebx, 3f4b0000h ;
- int 13h ;
- mov _eax, eax ;
- mov _ecx, ecx ;
- mov _edx, edx ;
- mov _ebx, ebx ;
- mov _es, es ;
- mov _di, di ;
- }
-
- if ( _eax >> 16 != 0x4d21 ||
- _ecx >> 16 != 0x4d45 ||
- _edx >> 16 != 0x4944 ||
- _ebx >> 16 != 0x4b53 )
- return NULL;
-
- memset(&mm, 0, sizeof mm);
-
- bytes = *(uint16_t far *)MK_FP(_es, _di);
-
- /* 27 is the most we know how to handle */
- if ( bytes > 27 )
- bytes = 27;
-
- _fmemcpy((void far *)&mm, (void far *)MK_FP(_es,_di), bytes);
-
- mm.cylinders = ((_ecx >> 8) & 0xff) + ((_ecx & 0xc0) << 2) + 1;
- mm.heads = ((_edx >> 8) & 0xff) + 1;
- mm.sectors = (_ecx & 0x3f);
-
- return &mm;
+ static struct memdiskinfo mm;
+ uint32_t _eax, _ebx, _ecx, _edx;
+ uint16_t _es, _di;
+ unsigned char _dl = drive;
+ uint16_t bytes;
+
+ __asm {
+ .386;
+ mov eax, 454 d0800h;
+ mov ecx, 444 d0000h;
+ mov edx, 53490000 h;
+ mov dl, _dl;
+ mov ebx, 3f 4 b0000h;
+ int 13 h;
+ mov _eax, eax;
+ mov _ecx, ecx;
+ mov _edx, edx;
+ mov _ebx, ebx;
+ mov _es, es;
+ mov _di, di;
+ }
+
+ if (_eax >> 16 != 0x4d21 ||
+ _ecx >> 16 != 0x4d45 || _edx >> 16 != 0x4944 || _ebx >> 16 != 0x4b53)
+ return NULL;
+
+ memset(&mm, 0, sizeof mm);
+
+ bytes = *(uint16_t far *) MK_FP(_es, _di);
+
+ /* 27 is the most we know how to handle */
+ if (bytes > 27)
+ bytes = 27;
+
+ _fmemcpy((void far *)&mm, (void far *)MK_FP(_es, _di), bytes);
+
+ mm.cylinders = ((_ecx >> 8) & 0xff) + ((_ecx & 0xc0) << 2) + 1;
+ mm.heads = ((_edx >> 8) & 0xff) + 1;
+ mm.sectors = (_ecx & 0x3f);
+
+ return &mm;
}
const char *bootloadername(uint8_t id)
{
- static const struct {
- uint8_t id, mask;
- const char *name;
- } *lp, list[] =
- {
- { 0x00, 0xf0, "LILO" },
- { 0x10, 0xf0, "LOADLIN" },
- { 0x31, 0xff, "SYSLINUX" },
- { 0x32, 0xff, "PXELINUX" },
- { 0x33, 0xff, "ISOLINUX" },
- { 0x34, 0xff, "EXTLINUX" },
- { 0x30, 0xf0, "SYSLINUX family" },
- { 0x40, 0xf0, "Etherboot" },
- { 0x50, 0xf0, "ELILO" },
- { 0x70, 0xf0, "GrUB" },
- { 0x80, 0xf0, "U-Boot" },
- { 0xA0, 0xf0, "Gujin" },
- { 0xB0, 0xf0, "Qemu" },
- { 0x00, 0x00, "unknown" }
+ static const struct {
+ uint8_t id, mask;
+ const char *name;
+ } *lp, list[] = {
+ {
+ 0x00, 0xf0, "LILO"}, {
+ 0x10, 0xf0, "LOADLIN"}, {
+ 0x31, 0xff, "SYSLINUX"}, {
+ 0x32, 0xff, "PXELINUX"}, {
+ 0x33, 0xff, "ISOLINUX"}, {
+ 0x34, 0xff, "EXTLINUX"}, {
+ 0x30, 0xf0, "SYSLINUX family"}, {
+ 0x40, 0xf0, "Etherboot"}, {
+ 0x50, 0xf0, "ELILO"}, {
+ 0x70, 0xf0, "GrUB"}, {
+ 0x80, 0xf0, "U-Boot"}, {
+ 0xA0, 0xf0, "Gujin"}, {
+ 0xB0, 0xf0, "Qemu"}, {
+ 0x00, 0x00, "unknown"}
};
- for ( lp = list ; ; lp++ ) {
- if ( ((id ^ lp->id) & lp->mask) == 0 )
- return lp->name;
- }
+ for (lp = list;; lp++) {
+ if (((id ^ lp->id) & lp->mask) == 0)
+ return lp->name;
+ }
}
int main(int argc, char *argv[])
{
- int d;
- int found = 0;
- struct memdiskinfo *m;
-
- for ( d = 0 ; d <= 0xff ; d++ ) {
- if ( (m = query_memdisk(d)) != NULL ) {
- printf("Drive %02X is MEMDISK %u.%02u:\n"
- "\tAddress = 0x%08lx, len = %lu sectors, chs = %u/%u/%u,\n"
- "\tloader = 0x%02x (%s),\n"
- "\tcmdline = %Fs\n",
- d, m->version >> 8, m->version & 0xff,
- m->base, m->size, m->cylinders, m->heads, m->sectors,
- m->bootloaderid, bootloadername(m->bootloaderid),
- m->cmdline);
- found++;
+ int d;
+ int found = 0;
+ struct memdiskinfo *m;
+
+ for (d = 0; d <= 0xff; d++) {
+ if ((m = query_memdisk(d)) != NULL) {
+ printf("Drive %02X is MEMDISK %u.%02u:\n"
+ "\tAddress = 0x%08lx, len = %lu sectors, chs = %u/%u/%u,\n"
+ "\tloader = 0x%02x (%s),\n"
+ "\tcmdline = %Fs\n",
+ d, m->version >> 8, m->version & 0xff,
+ m->base, m->size, m->cylinders, m->heads, m->sectors,
+ m->bootloaderid, bootloadername(m->bootloaderid),
+ m->cmdline);
+ found++;
+ }
}
- }
- return found;
+ return found;
}