Attachment #82681 for bug #118273

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




static gboolean
hf_scsi_is_cdrom (int type)
{
  return (type == T_CDROM || type == T_WORM || type == T_OPTICAL);
}

static HalDevice *

      hal_device_property_set_string(device, "scsi.type", "processor");
      break;
    case T_WORM:
    case T_CHANGER:
    case T_CDROM:
    case T_OPTICAL:
      hal_device_property_set_string(device, "scsi.type", "cdrom");
      break;
    case T_CHANGER:
      hal_device_property_set_string(device, "scsi.type", "medium_changer");
      break;
    case T_SCANNER:
      hal_device_property_set_string(device, "scsi.type", "scanner");
      break;

Return to bug 118273

Lines 54-60 Link Here

(-)hald/freebsd/hf-scsi.c (-2 / +4 lines)
54	static gboolean	54	static gboolean
55	hf_scsi_is_cdrom (int type)	55	hf_scsi_is_cdrom (int type)
56	{	56	{
57	return (type == T_CDROM \|\| type == T_WORM \|\| type == T_CHANGER \|\| type == T_OPTICAL);	57	return (type == T_CDROM \|\| type == T_WORM \|\| type == T_OPTICAL);
58	}	58	}
59		59
60	static HalDevice *	60	static HalDevice *
Lines 129-139 Link Here
129	hal_device_property_set_string(device, "scsi.type", "processor");	129	hal_device_property_set_string(device, "scsi.type", "processor");
130	break;	130	break;
131	case T_WORM:	131	case T_WORM:
132	case T_CHANGER:
133	case T_CDROM:	132	case T_CDROM:
134	case T_OPTICAL:	133	case T_OPTICAL:
135	hal_device_property_set_string(device, "scsi.type", "cdrom");	134	hal_device_property_set_string(device, "scsi.type", "cdrom");
136	break;	135	break;
		136	case T_CHANGER:
		137	hal_device_property_set_string(device, "scsi.type", "medium_changer");
		138	break;
137	case T_SCANNER:	139	case T_SCANNER:
138	hal_device_property_set_string(device, "scsi.type", "scanner");	140	hal_device_property_set_string(device, "scsi.type", "scanner");
139	break;	141	break;