From: Karel Zak <kzak@redhat.com>
Date: Mon, 10 Jun 2013 09:03:12 +0000 (+0200)
Subject: libfdisk: (sgi) add driver
X-Git-Tag: v2.24-rc1~209
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=067686d895f6bc1b3fc3088726ff0122111e69cc;p=thirdparty%2Futil-linux.git

libfdisk: (sgi) add driver

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am
index ec008d54c7..99cf93fbfa 100644
--- a/fdisks/Makemodule.am
+++ b/fdisks/Makemodule.am
@@ -15,8 +15,6 @@ fdisk_SOURCES = \
 	fdisks/fdiskdoslabel.h \
 	fdisks/fdiskmaclabel.c \
 	fdisks/fdiskmaclabel.h \
-	fdisks/fdisksgilabel.c \
-	fdisks/fdisksgilabel.h \
 	fdisks/fdisk-menu.c \
 	fdisks/partname.c \
 	fdisks/common.h
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 0652cb3103..7a40f7a037 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -36,7 +36,6 @@
 #include "closestream.h"
 
 #include "pt-sun.h"		/* to toggle flags */
-#include "fdisksgilabel.h"
 #include "fdiskmaclabel.h"
 #include "fdiskdoslabel.h"
 #include "fdiskbsdlabel.h"
diff --git a/fdisks/fdisksgilabel.h b/fdisks/fdisksgilabel.h
deleted file mode 100644
index dfbd40f4dd..0000000000
--- a/fdisks/fdisksgilabel.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef FDISK_SGI_LABEL_H
-#define FDISK_SGI_LABEL_H
-
-#include "bitops.h"
-#include "pt-sgi.h"
-
-
-/* toggle flags */
-#define SGI_FLAG_BOOT	1
-#define SGI_FLAG_SWAP	2
-
-/* fdisksgilabel.c */
-extern int  sgi_change_sysid(struct fdisk_context *cxt, int i, int sys);
-extern unsigned int	sgi_get_start_sector(struct fdisk_context *cxt, int i );
-extern unsigned int	sgi_get_num_sectors(struct fdisk_context *cxt, int i );
-extern void	sgi_set_bootpartition(struct fdisk_context *cxt, int i );
-extern void	sgi_set_swappartition(struct fdisk_context *cxt, int i );
-extern int	sgi_get_bootpartition(struct fdisk_context *cxt);
-extern int	sgi_get_swappartition(struct fdisk_context *cxt);
-
-
-extern int sgi_set_bootfile(struct fdisk_context *cxt);
-extern int sgi_create_info(struct fdisk_context *cxt);
-
-#endif /* FDISK_SGI_LABEL_H */
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 3ea1fa4492..5363a5ec15 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -19,6 +19,7 @@ libfdisk_la_SOURCES = \
 	libfdisk/src/parttype.c \
 	\
 	libfdisk/src/sun.c \
+	libfdisk/src/sgi.c \
 	libfdisk/src/gpt.c
 
 
diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
index 3832af0703..b5bd245e49 100644
--- a/libfdisk/src/libfdisk.h
+++ b/libfdisk/src/libfdisk.h
@@ -159,6 +159,20 @@ extern int fdisk_sun_set_ilfact(struct fdisk_context *cxt);
 extern int fdisk_sun_set_rspeed(struct fdisk_context *cxt);
 extern int fdisk_sun_set_pcylcount(struct fdisk_context *cxt);
 
+/* sgi.h */
+#define SGI_FLAG_BOOT	1
+#define SGI_FLAG_SWAP	2
+
+extern int  sgi_change_sysid(struct fdisk_context *cxt, int i, int sys);
+extern unsigned int	sgi_get_start_sector(struct fdisk_context *cxt, int i );
+extern unsigned int	sgi_get_num_sectors(struct fdisk_context *cxt, int i );
+extern void	sgi_set_bootpartition(struct fdisk_context *cxt, int i );
+extern void	sgi_set_swappartition(struct fdisk_context *cxt, int i );
+extern int	sgi_get_bootpartition(struct fdisk_context *cxt);
+extern int	sgi_get_swappartition(struct fdisk_context *cxt);
+extern int sgi_set_bootfile(struct fdisk_context *cxt);
+extern int sgi_create_info(struct fdisk_context *cxt);
+
 /* gpt */
 extern int fdisk_gpt_partition_set_uuid(struct fdisk_context *cxt, size_t i);
 extern int fdisk_gpt_partition_set_name(struct fdisk_context *cxt, size_t i);
diff --git a/fdisks/fdisksgilabel.c b/libfdisk/src/sgi.c
similarity index 99%
rename from fdisks/fdisksgilabel.c
rename to libfdisk/src/sgi.c
index 1c51ee346e..d16691aa89 100644
--- a/fdisks/fdisksgilabel.c
+++ b/libfdisk/src/sgi.c
@@ -19,8 +19,7 @@
 #include "bitops.h"
 #include "pt-sgi.h"
 #include "pt-mbr.h"
-#include "fdisk.h"
-#include "fdisksgilabel.h"
+#include "fdiskP.h"
 
 /*
  * in-memory fdisk SGI stuff