diff options
| -rw-r--r-- | mdk-stage1/Makefile | 6 | ||||
| -rw-r--r-- | mdk-stage1/NEWS | 1 | ||||
| -rw-r--r-- | mdk-stage1/automatic.c | 3 | ||||
| -rw-r--r-- | mdk-stage1/bootsplash.c | 70 | ||||
| -rw-r--r-- | mdk-stage1/bootsplash.h | 25 | ||||
| -rw-r--r-- | mdk-stage1/params.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/probe-modules.c | 1 | ||||
| -rw-r--r-- | mdk-stage1/rescue-gui.c | 1 | ||||
| -rw-r--r-- | mdk-stage1/tools.h | 1 |
9 files changed, 4 insertions, 106 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index f84dc2a75..398e82722 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -162,7 +162,7 @@ init: $(INITOBJS) $(STAGE1_LIBC) $(DIET) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) bootsplash.o $(PCMCIA_LIB) $(STAGE1_LIBC) +stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) $(DIET) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ @@ -181,10 +181,10 @@ $(STAGE1OBJS-NETWORK-STANDALONE): %-NETWORK-STANDALONE.o: %.c $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@ $(STAGE1OBJS-FULL): %-FULL.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -DENABLE_BOOTSPLASH -c $< -o $@ + $(DIET) $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -c $< -o $@ .c.o: - $(DIET) $(COMPILE) $(INCLUDES) -DENABLE_BOOTSPLASH -c $< + $(DIET) $(COMPILE) $(INCLUDES) -c $< clean: localclean diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index fc529794e..46ea493c0 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,4 @@ +- kill bootsplash support (we drop bootsplash in kernel in 2008) - kill firmware loader now that firmware are loaded by the kernel 1.73 diff --git a/mdk-stage1/automatic.c b/mdk-stage1/automatic.c index fd9eb3679..5e9ed56a2 100644 --- a/mdk-stage1/automatic.c +++ b/mdk-stage1/automatic.c @@ -102,7 +102,6 @@ char * get_auto_value(char * auto_param) enum return_type ask_from_list_auto(char *msg, char ** elems, char ** choice, char * auto_param, char ** elems_auto) { if (!IS_AUTOMATIC) { - exit_bootsplash(); return ask_from_list(msg, elems, choice); } else { char ** sav_elems = elems; @@ -124,7 +123,6 @@ enum return_type ask_from_list_auto(char *msg, char ** elems, char ** choice, ch enum return_type ask_from_list_comments_auto(char *msg, char ** elems, char ** elems_comments, char ** choice, char * auto_param, char ** elems_auto) { if (!IS_AUTOMATIC) { - exit_bootsplash(); return ask_from_list_comments(msg, elems, elems_comments, choice); } else { char ** sav_elems = elems; @@ -147,7 +145,6 @@ enum return_type ask_from_list_comments_auto(char *msg, char ** elems, char ** e enum return_type ask_from_entries_auto(char *msg, char ** questions, char *** answers, int entry_size, char ** questions_auto, void (*callback_func)(char ** strings)) { if (!IS_AUTOMATIC) { - exit_bootsplash(); return ask_from_entries(msg, questions, answers, entry_size, callback_func); } else { char * tmp_answers[50]; diff --git a/mdk-stage1/bootsplash.c b/mdk-stage1/bootsplash.c deleted file mode 100644 index 9d0d53327..000000000 --- a/mdk-stage1/bootsplash.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Pixel (pixel) - * - * Copyright 2004 Mandriva - * - * This software may be freely redistributed under the terms of the GNU - * public license. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#include <stdio.h> -#include "bootsplash.h" -#include "frontend.h" -#include "log.h" - -static int total_size; -static float previous; -static FILE* splash = NULL; - -static void update_progression_only(int current_size) -{ - if (splash && total_size) { - float ratio = (float) (current_size + 1) / total_size; - if (ratio > previous + 0.01) { - fprintf(splash, "show %d\n", (int) (ratio * 65534)); - fflush(splash); - previous = ratio; - } - } -} - -static void open_bootsplash(void) -{ - if (!splash) splash = fopen("/proc/splash", "w"); - if (!splash) log_message("opening /proc/splash failed"); -} - -void exit_bootsplash(void) -{ - log_message("exiting bootsplash"); - open_bootsplash(); - if (splash) { - fprintf(splash, "verbose\n"); - fflush(splash); - } -} - - -void init_progression(char *msg, int size) -{ - previous = 0; total_size = size; - open_bootsplash(); - update_progression_only(0); - init_progression_raw(msg, size); -} - -void update_progression(int current_size) -{ - update_progression_only(current_size); - update_progression_raw(current_size); -} - -void end_progression(void) -{ - end_progression_raw(); -} diff --git a/mdk-stage1/bootsplash.h b/mdk-stage1/bootsplash.h deleted file mode 100644 index 04c19c9f0..000000000 --- a/mdk-stage1/bootsplash.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Pixel (pixel) - * - * Copyright 2004 Mandriva - * - * This software may be freely redistributed under the terms of the GNU - * public license. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef _BOOTSPLASH_H_ -#define _BOOTSPLASH_H_ - -#ifdef ENABLE_BOOTSPLASH -void exit_bootsplash(void); -void tell_bootsplash(char *cmd); -#else -#define exit_bootsplash() -#endif - -#endif diff --git a/mdk-stage1/params.c b/mdk-stage1/params.c index 692c3e511..9398759ab 100644 --- a/mdk-stage1/params.c +++ b/mdk-stage1/params.c @@ -22,7 +22,6 @@ #include "utils.h" #include "automatic.h" #include "log.h" -#include "bootsplash.h" static struct param_elem params[50]; static int param_number = 0; @@ -173,5 +172,4 @@ void unset_automatic(void) { log_message("unsetting automatic"); unset_param(MODE_AUTOMATIC); - exit_bootsplash(); } diff --git a/mdk-stage1/probe-modules.c b/mdk-stage1/probe-modules.c index ad4f9e4cd..f101430b8 100644 --- a/mdk-stage1/probe-modules.c +++ b/mdk-stage1/probe-modules.c @@ -22,7 +22,6 @@ #include <string.h> #include "utils.h" -void exit_bootsplash(void) {} void stg1_error_message(char *msg, ...) { va_list args; diff --git a/mdk-stage1/rescue-gui.c b/mdk-stage1/rescue-gui.c index 5a7e10de2..0755865af 100644 --- a/mdk-stage1/rescue-gui.c +++ b/mdk-stage1/rescue-gui.c @@ -169,7 +169,6 @@ void unmount_filesystems(void) /* ------ UUURGH -- this is dirrrrrttttyyyyyy */ void probe_that_type(void) {} -void exit_bootsplash(void) {} int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))) diff --git a/mdk-stage1/tools.h b/mdk-stage1/tools.h index 9954c5e20..1b08e42ca 100644 --- a/mdk-stage1/tools.h +++ b/mdk-stage1/tools.h @@ -24,7 +24,6 @@ #define _TOOLS_H_ #include <stdlib.h> -#include "bootsplash.h" int image_has_stage2(); enum return_type create_IMAGE_LOCATION(char *location_full); |