[programs/modplay] #2 and #3: Fix modplay to be compilable with Rake

Also adjusted the call to `console_open` to be compatible with the
changes introduced in #137.

.gitignore

@@ -14,6 +14,7 @@ storm/x86/storm
 
 # These are painful but what do we do...
 programs/cluido/cluido
+programs/modplay/modplay
 servers/block/initial_ramdisk/initial_ramdisk
 servers/block/initial_ramdisk/ramdisk-auto.h
 servers/block/initial_ramdisk/ramdisk.image

libraries/log/functions.h

@@ -17,4 +17,4 @@ extern return_type log_print
      const char *message);
 
 extern return_type log_init
-    (log_structure_type *log_structure, char *class, tag_type *tag);
+    (log_structure_type *log_structure, const char *class, tag_type *tag);

libraries/log/log.c

@@ -28,7 +28,7 @@ static return_type log(log_structure_type *log_structure, ipc_log_print_type *ip
 }
 
 // Internal function for initialising a connection between the application and the log service.
-return_type log_init(log_structure_type *log_structure, char *class, tag_type *tag)
+return_type log_init(log_structure_type *log_structure, const char *class, tag_type *tag)
 {
     mailbox_id_type mailbox_id[10];
     unsigned int services = 10;

libraries/log/types.h

@@ -10,5 +10,5 @@
 typedef struct
 {
     ipc_structure_type ipc_structure;
-    char *log_class;
+    const char *log_class;
 } log_structure_type;

programs/Rakefile

@@ -4,8 +4,16 @@ Rake.application.options.rakelib = [pwd + '/../rakelib'] if Rake.application.opt
 
 SUBFOLDERS = %w[
   cluido
+  modplay
 ].freeze
 
+# Not yet converted to rake:
+#
+#   sampleplay
+#   serialtest
+#   streamplay
+#   tetris
+
 task default: SUBFOLDERS do |t|
   t.prerequisites.each do |folder|
     sh "cd #{folder} && #{RAKE_COMMAND}"

programs/cluido/AUTHORS

@@ -1,4 +1,4 @@
-AUTHORS ($Id$)
+AUTHORS
 =======
 
 cluido has been developed by the following people:

programs/modplay/Rakefile

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+OBJECTS = %w[
+  modfile.o
+  modplay.o
+].freeze
+
+LIBRARIES = %w[
+  console
+  ipc
+  log
+  memory
+  sound
+  string
+  system
+].freeze
+
+OUTPUT = 'modplay'.freeze
+EXTRA_LDFLAGS_PRE = '-Wl,--defsym=PROCESS_VM_BASE=0x46000000'.freeze
+
+load '../programs.rake'

programs/modplay/modfile.asm

@@ -1,10 +1,7 @@
-; $Id$
-
 global 		modfile, modfile_end
 section .data
 
 modfile:
-		incbin 		"AXELF.MOD"
-
+        incbin      "AXELF.MOD"
 
 modfile_end: