Attachment #7024 for bug #15512

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




	   cdp->atp->controller->lun,
	   (cdp->atp->unit == ATA_MASTER) ? "master" : "slave ");

    printf("acd%d:", cdp->lun);
    comma = 0;
    if (cdp->cap.cur_read_speed) {
	printf(" read %dKB/s", cdp->cap.cur_read_speed * 1000 / 1024);
	printf("read %dKB/s", cdp->cap.cur_read_speed * 1000 / 1024);
	if (cdp->cap.max_read_speed) 
	    printf(" (%dKB/s)", cdp->cap.max_read_speed * 1000 / 1024);
	if ((cdp->cap.cur_write_speed) &&

	    if (cdp->cap.max_write_speed)
		printf(" (%dKB/s)", cdp->cap.max_write_speed * 1000 / 1024);
	}
 	comma = 1;
    }
    if (cdp->cap.buf_size) {
	printf("%s %dKB buffer", comma ? "," : "", cdp->cap.buf_size); comma = 1;
    }
    printf("%s %s\n", comma ? "," : "", ata_mode2str(cdp->atp->controller->mode[
				  (cdp->atp->unit == ATA_MASTER) ? 0 : 1])); comma = 1;

    printf("acd%d: supported read types:", cdp->lun);
    comma = 0;

Return to bug 15512

Lines 260-268 Link Here

(-)atapi-cd.c (-6 / +9 lines)
260	cdp->atp->controller->lun,	260	cdp->atp->controller->lun,
261	(cdp->atp->unit == ATA_MASTER) ? "master" : "slave ");	261	(cdp->atp->unit == ATA_MASTER) ? "master" : "slave ");
262		262
		263	printf("acd%d:", cdp->lun);
		264	comma = 0;
263	if (cdp->cap.cur_read_speed) {	265	if (cdp->cap.cur_read_speed) {
264	printf("acd%d: ", cdp->lun);	266	printf(" read %dKB/s", cdp->cap.cur_read_speed * 1000 / 1024);
265	printf("read %dKB/s", cdp->cap.cur_read_speed * 1000 / 1024);
266	if (cdp->cap.max_read_speed)	267	if (cdp->cap.max_read_speed)
267	printf(" (%dKB/s)", cdp->cap.max_read_speed * 1000 / 1024);	268	printf(" (%dKB/s)", cdp->cap.max_read_speed * 1000 / 1024);
268	if ((cdp->cap.cur_write_speed) &&	269	if ((cdp->cap.cur_write_speed) &&
Lines 272-282 Link Here
272	if (cdp->cap.max_write_speed)	273	if (cdp->cap.max_write_speed)
273	printf(" (%dKB/s)", cdp->cap.max_write_speed * 1000 / 1024);	274	printf(" (%dKB/s)", cdp->cap.max_write_speed * 1000 / 1024);
274	}	275	}
		276	comma = 1;
275	}	277	}
276	if (cdp->cap.buf_size)	278	if (cdp->cap.buf_size) {
277	printf(", %dKB buffer", cdp->cap.buf_size);	279	printf("%s %dKB buffer", comma ? "," : "", cdp->cap.buf_size); comma = 1;
278	printf(", %s\n", ata_mode2str(cdp->atp->controller->mode[	280	}
279	(cdp->atp->unit == ATA_MASTER) ? 0 : 1]));	281	printf("%s %s\n", comma ? "," : "", ata_mode2str(cdp->atp->controller->mode[
		282	(cdp->atp->unit == ATA_MASTER) ? 0 : 1])); comma = 1;
280		283
281	printf("acd%d: supported read types:", cdp->lun);	284	printf("acd%d: supported read types:", cdp->lun);
282	comma = 0;	285	comma = 0;