Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 176380 | Differences between
and this patch

Collapse All | Expand All

(-)a/hald/device_info.c (-8 / +13 lines)
Lines 953-961 Link Here
953
		switch (rule->rtype) {
953
		switch (rule->rtype) {
954
		case RULE_MATCH:
954
		case RULE_MATCH:
955
			/* skip non-matching rules block */
955
			/* skip non-matching rules block */
956
			/*HAL_INFO(("%p match '%s' at %s", rule, rule->key, hal_device_get_udi (d)));*/
956
			HAL_INFO(("%p match '%s' at %s", rule, rule->key, hal_device_get_udi (d)));
957
			if (!handle_match (rule, d)) {
957
			if (!handle_match (rule, d)) {
958
				/*HAL_INFO(("no match, skip to rule (%llx)", rule->jump_position));*/
958
				HAL_INFO(("no match, skip to rule (%llx)", rule->jump_position));
959
960
				if (!rule->jump_position)
961
					break;
962
963
				HAL_INFO(("Jumping to rule %d", rule->jump_position));
959
				rule = di_jump(rule);
964
				rule = di_jump(rule);
960
965
961
				if(rule == NULL)
966
				if(rule == NULL)
Lines 1007-1015 Link Here
1007
		/* Checking if we have at least one preprobe rule */
1012
		/* Checking if we have at least one preprobe rule */
1008
		if(header->fdi_rules_information > header->fdi_rules_preprobe)
1013
		if(header->fdi_rules_information > header->fdi_rules_preprobe)
1009
		{
1014
		{
1010
			/*HAL_INFO(("preprobe rules offset: %ld", header->fdi_rules_preprobe));
1015
			HAL_INFO(("preprobe rules offset: %ld", header->fdi_rules_preprobe));
1011
			HAL_INFO(("preprobe rules size: %ld",
1016
			HAL_INFO(("preprobe rules size: %ld",
1012
			header->fdi_rules_information - header->fdi_rules_preprobe));*/
1017
			header->fdi_rules_information - header->fdi_rules_preprobe));
1013
			rules_match_and_merge_device (RULES_PTR(header->fdi_rules_preprobe), d);
1018
			rules_match_and_merge_device (RULES_PTR(header->fdi_rules_preprobe), d);
1014
		}
1019
		}
1015
		break;
1020
		break;
Lines 1018-1026 Link Here
1018
		/* Checking if we have at least one information rule */
1023
		/* Checking if we have at least one information rule */
1019
		if(header->fdi_rules_policy > header->fdi_rules_information)
1024
		if(header->fdi_rules_policy > header->fdi_rules_information)
1020
		{
1025
		{
1021
			/*HAL_INFO(("information rules offset: %ld", header->fdi_rules_information));
1026
			HAL_INFO(("information rules offset: %ld", header->fdi_rules_information));
1022
			HAL_INFO(("information rules size: %ld",
1027
			HAL_INFO(("information rules size: %ld",
1023
			header->fdi_rules_policy - header->fdi_rules_information));*/
1028
			header->fdi_rules_policy - header->fdi_rules_information));
1024
			rules_match_and_merge_device (RULES_PTR(header->fdi_rules_information), d);
1029
			rules_match_and_merge_device (RULES_PTR(header->fdi_rules_information), d);
1025
		}
1030
		}
1026
		break;
1031
		break;
Lines 1029-1037 Link Here
1029
		/* Checking if we have at least one policy rule */
1034
		/* Checking if we have at least one policy rule */
1030
		if(header->all_rules_size > header->fdi_rules_policy)
1035
		if(header->all_rules_size > header->fdi_rules_policy)
1031
		{
1036
		{
1032
			/*HAL_INFO(("policy rules offset: %ld", header->fdi_rules_policy));
1037
			HAL_INFO(("policy rules offset: %ld", header->fdi_rules_policy));
1033
			HAL_INFO(("policy rules size: %ld",
1038
			HAL_INFO(("policy rules size: %ld",
1034
			header->all_rules_size - header->fdi_rules_policy));*/
1039
			header->all_rules_size - header->fdi_rules_policy));
1035
			rules_match_and_merge_device (RULES_PTR(header->fdi_rules_policy), d);
1040
			rules_match_and_merge_device (RULES_PTR(header->fdi_rules_policy), d);
1036
		}
1041
		}
1037
		break;
1042
		break;

Return to bug 176380