assembler: Put commandline args into structure

[b43-tools.git] / assembler / args.h

diff --git a/assembler/args.h b/assembler/args.h
index fc3abc1b46947174dede81da0928166e1271c3d6..a2c86d160f27efcf21a259d67fee428057946b56 100644 (file)
--- a/assembler/args.h
+++ b/assembler/args.h
@@ -10,17 +10,22 @@ enum fwformat {
        FMT_B43,        /* b43/b43legacy headers. */
 };
 
+struct cmdline_args {
+       int debug;                              /* Debug level. */
+       bool print_sizes;                       /* Print sizes after assembling. */
+       const char *initvals_fn_extension;      /* Initvals filename extension. */
+       const char *real_infile_name;           /* The real input file name. */
+       enum fwformat outformat;                /* The output file format. */
+};
+
 int parse_args(int argc, char **argv);
 int open_input_file(void);
 void close_input_file(void);
 
-extern int _debug;
-extern bool arg_print_sizes;
-extern const char *initvals_fn_extension;
-extern enum fwformat output_format;
+extern struct cmdline_args cmdargs;
 
-#define IS_DEBUG               (_debug > 0)
-#define IS_VERBOSE_DEBUG       (_debug > 1)
-#define IS_INSANE_DEBUG                (_debug > 2)
+#define IS_DEBUG               (cmdargs.debug > 0)
+#define IS_VERBOSE_DEBUG       (cmdargs.debug > 1)
+#define IS_INSANE_DEBUG                (cmdargs.debug > 2)
 
 #endif /* BCM43xx_ASM_ARGS_H_ */