Attachment #2349 for bug #13841

View | Details | Raw Unified | Return to bug 13841
Collapse All | Expand All

Lines 365-370 Link Here

(-)propagator.orig/probing.c (-1 / +4 lines)
365	static int already_probed_usb_controllers = 0;	365	static int already_probed_usb_controllers = 0;
366	static int already_mounted_usbdev = 0;	366	static int already_mounted_usbdev = 0;
367	static int already_probed_hid = 0;	367	static int already_probed_hid = 0;
		368	static int usb_sleep = 0;
368		369
369	FILE * f;	370	FILE * f;
370	char buf[200];	371	char buf[200];
Lines 404-410 Link Here
404	if (type == MEDIA_ADAPTERS) {	405	if (type == MEDIA_ADAPTERS) {
405	stg1_info_message("About to load driver for usb storage device: usb-storage");	406	stg1_info_message("About to load driver for usb storage device: usb-storage");
406	my_insmod("usb-storage", ANY_DRIVER_TYPE, NULL);	407	my_insmod("usb-storage", ANY_DRIVER_TYPE, NULL);
407	sleep(5); /* wait for dust settles down */	408	usb_sleep = get_usb_delay();
		409	log_message("Will be sleep %d seconds...", usb_sleep);
		410	sleep(usb_sleep); /* wait for dust settles down */
408	}	411	}
409		412
410	#ifdef ENABLE_USBNET	413	#ifdef ENABLE_USBNET




	return i;
}

int get_usb_delay()
{
	int usb_delay = 0;
	char * usb_delay_param = get_param_valued("usbdelay");
	if (!usb_delay_param) {
		return(5);
	}
	if (sscanf(usb_delay_param,"%d",&usb_delay) != 1) {
		return(5);
	}
	return(usb_delay);
}


int do_losetup(char * device, char * target)
{
	int loopfd, targfd;

Lines 47-52 Link Here

(-)propagator.orig/tools.h (+1 lines)
47	int update_splash(void);	47	int update_splash(void);
48	int prepare_progress(void);	48	int prepare_progress(void);
49	void close_progress(void);	49	void close_progress(void);
		50	int get_usb_delay();
50		51
51	struct param_elem	52	struct param_elem
52	{	53	{

Return to bug 13841

Lines 518-523 Link Here

(-)propagator.orig/tools.c (+14 lines)
518	return i;	518	return i;
519	}	519	}
520		520
		521	int get_usb_delay()
		522	{
		523	int usb_delay = 0;
		524	char * usb_delay_param = get_param_valued("usbdelay");
		525	if (!usb_delay_param) {
		526	return(5);
		527	}
		528	if (sscanf(usb_delay_param,"%d",&usb_delay) != 1) {
		529	return(5);
		530	}
		531	return(usb_delay);
		532	}
		533
		534
521	int do_losetup(char * device, char * target)	535	int do_losetup(char * device, char * target)
522	{	536	{
523	int loopfd, targfd;	537	int loopfd, targfd;