build a proper driver version for the EFI Component Name

* Also simplify setup for grub_<fs>_init/grub_<fs>_fini calls

ChangeLog.txt

@@ -0,0 +1,5 @@
+For detailed information about the changes below, please see the git log or
+visit: https://github.com/pbatard/efifs
+
+2014-06-29: v0.4
+* Initial ALPHA release (NTFS only)

Make.common

@@ -9,7 +9,7 @@ GNUEFILIB       = /usr/lib
 EFILIB          = /usr/lib
 EFICRT0         = /usr/lib
 # Directory where you want the driver files to be copied into with 'make install'
-INSTALL_DIR     = /boot/efi
+INSTALL_DIR     = /boot/efi/EFI/refind/drivers_x64/
 
 # You shouldn't have to edit anything below this
 HOSTARCH        = $(shell uname -m | sed s,i[3456789]86,ia32,)
@@ -19,7 +19,7 @@ CPPFLAGS        = -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol -I$(SRCDI
                   -DGNU_EFI_USE_MS_ABI -DGRUB_MACHINE_EFI -DGRUB_KERNEL -DGRUB_FILE=\"$(subst $(srcdir)/,,$<)\"
 
 OPTIMFLAGS      = -O2 -fno-strict-aliasing
-DEBUGFLAGS      = -Wall -Wunused -Wno-pointer-sign -Werror-implicit-function-declaration -Wshadow
+DEBUGFLAGS      = -Wall -Wunused -Wno-pointer-sign -Wshadow
 CFLAGS          = $(ARCH3264) $(OPTIMFLAGS) -fno-stack-protector -fpic -fshort-wchar -mno-red-zone $(DEBUGFLAGS)
 ASFLAGS         = $(ARCH3264)
 LDFLAGS         = -nostdlib -znocombreloc -zdefs

README.md

@@ -24,7 +24,7 @@ drivers, based on the GRUB 2.0 read-only drivers.
   Boot into the EFI shell and run the following:
   * `load fs0:\ntfs_x64.efi` or wherever your driver was copied
   * `map -r` this should make a new `fs#` available, eg `fs2:`
-  * `dir fs2:` this should list the NTFS content
+  * You should now be able to navigate and access NTFS content (in read-only mode)
   * For logging output, set the `FS_LOGGING` shell variable to 1 or more
   * To unload use the `drivers` command, then `unload` with the driver ID
 

src/Makefile

@@ -29,7 +29,7 @@ ifeq ($(ARCH),x86_64)
   LD_CODE       = elf_x86_64
 endif
 
-LOCAL_CPPFLAGS  = -DGRUB_FS_INIT=grub_$(DRIVERNAME)_init -DGRUB_FS_FINI=grub_$(DRIVERNAME)_fini $(ARCH_C_FLAGS) -I$(SRCDIR)/../include -I$(SRCDIR)/../grub -I$(SRCDIR)/../grub/include
+LOCAL_CPPFLAGS  = -DDRIVERNAME=$(DRIVERNAME) $(ARCH_C_FLAGS) -I$(SRCDIR)/../include -I$(SRCDIR)/../grub -I$(SRCDIR)/../grub/include
 LOCAL_LIBS      = -lgrub
 LOCAL_LDFLAGS   = -L.
 OBJS            = fs_driver.o grubberize.o ../grub/grub-core/fs/$(DRIVERNAME).o

src/fs_driver.c

@@ -797,7 +797,8 @@ static EFI_STATUS EFIAPI
 FSGetDriverName(EFI_COMPONENT_NAME_PROTOCOL *This,
 		CHAR8 *Language, CHAR16 **DriverName)
 {
-	*DriverName = L"FS driver";
+	*DriverName = WIDEN(STRINGIFY(DRIVERNAME)) L" driver v" WIDEN(STRINGIFY(FS_DRIVER_VERSION_MAJOR)) \
+			L"." WIDEN(STRINGIFY(FS_DRIVER_VERSION_MINOR)) L" (" WIDEN(PACKAGE_STRING) L")";
 	return EFI_SUCCESS;
 }
 
@@ -1021,7 +1022,7 @@ FSDriverUninstall(EFI_HANDLE ImageHandle)
 			NULL);
 
 	/* Unregister the relevant grub module */
-	GRUB_FS_FINI();
+	GRUB_FS_CALL(DRIVERNAME, fini)();
 
 	/* Uninstall our mutex (we're the only instance that can run this code) */
 	LibUninstallProtocolInterfaces(MutexHandle,
@@ -1120,7 +1121,7 @@ FSDriverInstall(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE* SystemTable)
 	LoadedImage->Unload = FSDriverUninstall;
 
 	/* Register the relevant grub module */
-	GRUB_FS_INIT();
+	GRUB_FS_CALL(DRIVERNAME, init)();
 
 	PrintDebug(L"FS driver installed.\n");
 	return EFI_SUCCESS;

src/fs_driver.h

@@ -32,7 +32,7 @@
 
 /* Driver version */
 #define FS_DRIVER_VERSION_MAJOR 0
-#define FS_DRIVER_VERSION_MINOR 3
+#define FS_DRIVER_VERSION_MINOR 4
 
 #undef offsetof
 #if defined(__GNUC__) && (__GNUC__ > 3)
@@ -81,6 +81,12 @@ extern void PrintStatusError(EFI_STATUS Status, const CHAR16 *Format, ...);
 #define MIN(x,y) ((x)<(y)?(x):(y))
 #endif
 
+#define _STRINGIFY(s) #s
+#define STRINGIFY(s) _STRINGIFY(s)
+
+#define _WIDEN(s) L ## s 
+#define WIDEN(s) _WIDEN(s)
+
 /* Forward declaration */
 struct _EFI_FS;
 
@@ -105,8 +111,11 @@ typedef struct _EFI_FS {
 	EFI_GRUB_FILE          RootFile;
 } EFI_FS;
 
-extern void GRUB_FS_INIT(void);
-extern void GRUB_FS_FINI(void);
+/* Setup generic function calls for grub_<fs>_init and grub_<fs>_exit */
+#define MAKE_FN_NAME(drivername, suffix) grub_ ## drivername ## _ ## suffix
+#define GRUB_FS_CALL(drivername, suffix) MAKE_FN_NAME(drivername, suffix)
+extern void GRUB_FS_CALL(DRIVERNAME, init)(void);
+extern void GRUB_FS_CALL(DRIVERNAME, fini)(void);
 
 extern EFI_HANDLE EfiImageHandle;
 extern EFI_GUID ShellVariable;