[Debburn-changes] r757 - cdrkit/trunk/wodim
Eduard Bloch
blade at alioth.debian.org
Thu May 3 11:09:16 UTC 2007
Author: blade
Date: 2007-05-03 11:09:15 +0000 (Thu, 03 May 2007)
New Revision: 757
Modified:
cdrkit/trunk/wodim/drv_mmc.c
Log:
Don't print unhelpful information in -atip, proper dvd structure decoding needs to be written or ported from dvd+rw-media-info. Point users to dvd+rw-mediainfo untill that happens.
Modified: cdrkit/trunk/wodim/drv_mmc.c
===================================================================
--- cdrkit/trunk/wodim/drv_mmc.c 2007-05-03 10:27:24 UTC (rev 756)
+++ cdrkit/trunk/wodim/drv_mmc.c 2007-05-03 11:09:15 UTC (rev 757)
@@ -225,45 +225,45 @@
};
cdr_t cdr_mdvd = {
- 0, 0,
- CDR_SWABAUDIO,
- CDR_CDRW_ALL,
- 370,370,
- "mmc_mdvd",
- "generic SCSI-3/mmc DVD-R(W) driver",
- 0,
- (dstat_t *)0,
- identify_mmc,
- attach_mdvd,
- init_mmc,
- getdisktype_mdvd,
- scsi_load,
- scsi_unload,
- read_buff_cap,
- cmd_dummy, /* check_recovery */
- (int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy, /* recover */
- speed_select_mdvd,
- select_secsize,
- next_wr_addr_mdvd,
- (int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
- scsi_cdr_write,
- (int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */
- (int(*)__PR((SCSI *usalp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
- write_leadin_mmc,
- open_track_mdvd,
- close_track_mdvd,
- open_session_mdvd,
- cmd_dummy,
- cmd_dummy, /* abort */
- read_session_offset,
- fixate_mdvd,
- stats_mmc,
- blank_mmc,
- format_mdvd,
- send_opc_mmc,
- opt1_mdvd,
- opt2_mmc,
- dvd_dual_layer_split,
+ 0, 0,
+ CDR_SWABAUDIO,
+ CDR_CDRW_ALL,
+ 370,370,
+ "mmc_mdvd",
+ "generic SCSI-3/mmc DVD-R(W) driver",
+ 0,
+ (dstat_t *)0,
+ identify_mmc,
+ attach_mdvd,
+ init_mmc,
+ getdisktype_mdvd,
+ scsi_load,
+ scsi_unload,
+ read_buff_cap,
+ cmd_dummy, /* check_recovery */
+ (int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy, /* recover */
+ speed_select_mdvd,
+ select_secsize,
+ next_wr_addr_mdvd,
+ (int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
+ scsi_cdr_write,
+ (int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */
+ (int(*)__PR((SCSI *usalp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
+ write_leadin_mmc,
+ open_track_mdvd,
+ close_track_mdvd,
+ open_session_mdvd,
+ cmd_dummy,
+ cmd_dummy, /* abort */
+ read_session_offset,
+ fixate_mdvd,
+ stats_mmc,
+ blank_mmc,
+ format_mdvd,
+ send_opc_mmc,
+ opt1_mdvd,
+ opt2_mmc,
+ dvd_dual_layer_split,
};
/*
@@ -1499,23 +1499,25 @@
static int
getdisktype_mdvd(SCSI *usalp, cdr_t *dp)
{
- int ret = 0;
- dstat_t *dsp = dp->cdr_dstat;
+ int ret = 0;
+ dstat_t *dsp = dp->cdr_dstat;
- struct track_info track_info;
- if(getdisktype_mmc(usalp, dp)<0)
- return -1;
+ struct track_info track_info;
+ printf("HINT: use dvd+rw-mediainfo from dvd+rw-tools for information extraction.\n");
+ /* if(getdisktype_mmc(usalp, dp)<0)
+ return -1;
+ */
- /* read rzone info to get the space left on disk */
- /*ds_trlast is the last rzone on disk, can be invisible */
- if(read_rzone_info(usalp, (caddr_t)&track_info, sizeof(track_info))>=0)
- dsp->ds_maxblocks=a_to_u_4_byte(track_info.free_blocks)+a_to_4_byte(track_info.next_writable_addr);
-
- dsp->ds_disktype&= ~DT_CD;
- dsp->ds_disktype|= DT_DVD;
-
- return (ret);
-
+ /* read rzone info to get the space left on disk */
+ /*ds_trlast is the last rzone on disk, can be invisible */
+ if(read_rzone_info(usalp, (caddr_t)&track_info, sizeof(track_info))>=0)
+ dsp->ds_maxblocks=a_to_u_4_byte(track_info.free_blocks)+a_to_4_byte(track_info.next_writable_addr);
+
+ dsp->ds_disktype&= ~DT_CD;
+ dsp->ds_disktype|= DT_DVD;
+
+ return (ret);
+
}
static int
More information about the Debburn-changes
mailing list