Attachment #98716 for bug #145445

Lines 1-6 Link Here

(-)qpxtool-0.6/ChangeLog (+5 lines)
1	QPxTool History	1	QPxTool History
2		2
3	***********************************************	3	***********************************************
		4	** 0.6.1 (2006-09-00)
		5
		6	-
		7
		8	***********************************************
4	** 0.6.0 (2006-08-25)	9	** 0.6.0 (2006-08-25)
5		10
6	- scons is used to compile stuff	11	- scons is used to compile stuff

Lines 6-11 Link Here

(-)qpxtool-0.6/Makefile (+1 lines)
6		6
7	install:	7	install:
8	scons install	8	scons install
		9	./makesuid
9		10
10	install-lib:	11	install-lib:
11	scons install-lib	12	scons install-lib

Lines 18-24 Link Here

(-)qpxtool-0.6/lib/qpxscan/include/plextor_qcheck.h (-1 / +1 lines)
18	extern int plextor_end_scan(drive_info* drive);	18	extern int plextor_end_scan(drive_info* drive);
19		19
20	extern int plextor_start_fete(drive_info* drive);	20	extern int plextor_start_fete(drive_info* drive);
21	extern int plextor_end_fete(drive_info* drive);
22	extern int plextor_read_fete(drive_info* drive);	21	extern int plextor_read_fete(drive_info* drive);
		22	extern int plextor_end_fete(drive_info* drive);
23		23
24	#endif //__CHECK_PLEXTOR_	24	#endif //__CHECK_PLEXTOR_

Lines 9-14 Link Here

(-)qpxtool-0.6/lib/qpxscan/include/scan_pointers.h (+3 lines)
9	* See the file "COPYING" for the exact licensing terms.	9	* See the file "COPYING" for the exact licensing terms.
10	*/	10	*/
11		11
		12	#define SCAN_BLOCK_DONE 0
		13	#define SCAN_BLOCK_FAIL 1
		14	#define SCAN_BLOCK_LAST 2
12		15
13	#ifndef __SCAN_POINTERS_	16	#ifndef __SCAN_POINTERS_
14	#define __SCAN_POINTERS_	17	#define __SCAN_POINTERS_

Lines 88-94 Link Here

(-)qpxtool-0.6/lib/qpxscan/media_check_nec.cpp (-18 / +16 lines)
88	drive->cmd[0] = 0xF3;	88	drive->cmd[0] = 0xF3;
89	drive->cmd[1] = 0x03;	89	drive->cmd[1] = 0x03;
90	if ((drive->err=drive->cmd.transport(READ,drive->rd_buf,8))){	90	if ((drive->err=drive->cmd.transport(READ,drive->rd_buf,8))){
91	sperror ("nec_cx_do_one_interval",drive->err); return 1;	91	sperror ("nec_cx_do_one_interval",drive->err);
		92	if (drive->err == 0x30200) return SCAN_BLOCK_LAST;
		93	else return SCAN_BLOCK_FAIL;
92	}	94	}
93	*BLER = swap2(drive->rd_buf+4);	95	*BLER = swap2(drive->rd_buf+4);
94	*E11 = 0;	96	*E11 = 0;
Lines 99-105 Link Here
99	*E32 = 0;	101	*E32 = 0;
100	// *lba+=75;	102	// *lba+=75;
101	lba=((int)drive->rd_buf[1] 4500 + (int)drive->rd_buf[2] * 75 + (int)drive->rd_buf[3]);	103	lba=((int)drive->rd_buf[1] 4500 + (int)drive->rd_buf[2] * 75 + (int)drive->rd_buf[3]);
102	return 0;	104	return SCAN_BLOCK_DONE;
103	}	105	}
104		106
105	int nec_pie_do_eight_ecc_blocks(drive_info* drive, int* lba, int* pie, int* pof)	107	int nec_pie_do_eight_ecc_blocks(drive_info* drive, int* lba, int* pie, int* pof)
Lines 108-124 Link Here
108	drive->cmd[0] = 0xF3;	110	drive->cmd[0] = 0xF3;
109	drive->cmd[1] = 0x03;	111	drive->cmd[1] = 0x03;
110	if ((drive->err=drive->cmd.transport(READ,drive->rd_buf,8))){	112	if ((drive->err=drive->cmd.transport(READ,drive->rd_buf,8))){
111	sperror ("nec_pie_do_one_interval",drive->err); return 1;	113	sperror ("nec_pie_do_one_interval",drive->err);
		114	if (drive->err == 0x30200) return SCAN_BLOCK_LAST;
		115	else return SCAN_BLOCK_FAIL;
112	}	116	}
113	*pie = swap2(drive->rd_buf+4);	117	*pie = swap2(drive->rd_buf+4);
114	*pof = 0;	118	*pof = 0;
115	// *pif = swap2(drive->rd_buf+6);	119	*lba=swap4(drive->rd_buf);
116		120	// *lba+=0x80;
117	// *lba=(((int)drive->rd_buf[0] << 24) & 0xFF000000) + (((int)drive->rd_buf[1] << 16) & 0xFF0000) +	121	return SCAN_BLOCK_DONE;
118	// (((int)drive->rd_buf[2] << 8) & 0xFF00) + (((int)drive->rd_buf[3]) & 0xFF);
119	// *lba=swap4(drive->rd_buf);
120	*lba+=0x80;
121	return 0;
122	}	122	}
123		123
124	int nec_pif_do_one_ecc_block(drive_info* drive, int* lba, int* pif)	124	int nec_pif_do_one_ecc_block(drive_info* drive, int* lba, int* pif)
Lines 127-142 Link Here
127	drive->cmd[0] = 0xF3;	127	drive->cmd[0] = 0xF3;
128	drive->cmd[1] = 0x03;	128	drive->cmd[1] = 0x03;
129	if ((drive->err=drive->cmd.transport(READ,drive->rd_buf,8))){	129	if ((drive->err=drive->cmd.transport(READ,drive->rd_buf,8))){
130	sperror ("nec_pif_do_one_interval",drive->err); return 1;	130	sperror ("nec_pif_do_one_interval",drive->err);
		131	if (drive->err == 0x30200) return SCAN_BLOCK_LAST;
		132	else return SCAN_BLOCK_FAIL;
131	}	133	}
132	// *pie = swap2(drive->rd_buf+4);
133	*pif = swap2(drive->rd_buf+6);	134	*pif = swap2(drive->rd_buf+6);
134	// *lba+=75;	135	*lba=swap4(drive->rd_buf);
135	// *lba=(((int)drive->rd_buf[0] << 24) & 0xFF000000) + (((int)drive->rd_buf[1] << 16) & 0xFF0000) +	136	// *lba+=0x10;
136	// (((int)drive->rd_buf[2] << 8) & 0xFF00) + (((int)drive->rd_buf[3]) & 0xFF);	137	return SCAN_BLOCK_DONE;
137	// *lba=swap4(drive->rd_buf);
138	*lba+=0x10;
139	return 0;
140	}	138	}
141		139
142	// *********** END SCAN COMMAND *******	140	// *********** END SCAN COMMAND *******

Lines 208-213 Link Here

(-)qpxtool-0.6/qpxtool/qcheck/test_threads.cpp (-5 / +32 lines)
208	post_signal(event_test_init,(void*)TEST);	208	post_signal(event_test_init,(void*)TEST);
209	struct timeval start, finish;	209	struct timeval start, finish;
210		210
		211	int scan_blk = 0;
		212	int blocks_failed = 0;
		213
211	block_data block;	214	block_data block;
212	block.test=TEST_CD_CX;	215	block.test=TEST_CD_CX;
213	block.err_total=0; block.err_max=0; block.err_cur=0; block.err_avg=0.0;	216	block.err_total=0; block.err_max=0; block.err_cur=0; block.err_avg=0.0;
Lines 252-258 Link Here
252	block_E12=0; block_E22=0; block_E32=0;	255	block_E12=0; block_E22=0; block_E32=0;
253		256
254	for (i=0;(i<128) && (block.idx == oldidx) && (block.lba<drive->media.capacity);i++) {	257	for (i=0;(i<128) && (block.idx == oldidx) && (block.lba<drive->media.capacity);i++) {
255	scan_tbl[drive->ven_ID].cx_one_interval(drive, &block.lba, &BLER, &E11, &E21, &E31, &E12, &E22, &E32);	258	scan_blk = scan_tbl[drive->ven_ID].cx_one_interval(drive, &block.lba, &BLER, &E11, &E21, &E31, &E12, &E22, &E32);
		259	switch(scan_blk) {
		260	case SCAN_BLOCK_DONE: break;
		261	case SCAN_BLOCK_FAIL: blocks_failed++; break;
		262	case SCAN_BLOCK_LAST: block.lba = drive->media.capacity; break;
		263	default: break;
		264	}
256	// block.idx = max(0, block.lba/hscaleCD - 1);	265	// block.idx = max(0, block.lba/hscaleCD - 1);
257	block.idx = block.lba/hscaleCD;	266	block.idx = block.lba/hscaleCD;
258	// block.lba+=75;	267	// block.lba+=75;
Lines 471-476 Link Here
471	char* TEST="DVD PIE";	480	char* TEST="DVD PIE";
472	post_signal(event_test_init,(void*)TEST);	481	post_signal(event_test_init,(void*)TEST);
473	struct timeval start, finish;	482	struct timeval start, finish;
		483
		484	int scan_blk = 0;
		485	int blocks_failed = 0;
474	int hscale = hscaleDVD*drive->media.layers;	486	int hscale = hscaleDVD*drive->media.layers;
475		487
476	block_data block;	488	block_data block;
Lines 530-540 Link Here
530	// block.lba = block.idxhscale+i128;	542	// block.lba = block.idxhscale+i128;
531	oldidx = block.idx;	543	oldidx = block.idx;
532	if (read_poe)	544	if (read_poe)
533	scan_tbl[drive->ven_ID].pie_poe_8_ecc_blocks(drive, &block.lba, &pie, &poe, &pof);	545	scan_blk = scan_tbl[drive->ven_ID].pie_poe_8_ecc_blocks(drive, &block.lba, &pie, &poe, &pof);
534	else if (read_pif)	546	else if (read_pif)
535	scan_tbl[drive->ven_ID].pie_pif_8_ecc_blocks(drive, &block.lba, &pie, &pif, &pof);	547	scan_blk = scan_tbl[drive->ven_ID].pie_pif_8_ecc_blocks(drive, &block.lba, &pie, &pif, &pof);
536	else	548	else
537	scan_tbl[drive->ven_ID].pie_8_ecc_blocks(drive, &block.lba, &pie, &pof);	549	scan_blk = scan_tbl[drive->ven_ID].pie_8_ecc_blocks(drive, &block.lba, &pie, &pof);
		550	switch(scan_blk) {
		551	case SCAN_BLOCK_DONE: break;
		552	case SCAN_BLOCK_FAIL: blocks_failed++; break;
		553	case SCAN_BLOCK_LAST: block.lba = drive->media.capacity; break;
		554	default: break;
		555	}
538	block.idx = block.lba / hscale;	556	block.idx = block.lba / hscale;
539	// printf("block.lba = %d; block.idx = %d\n",block.lba,block.idx);	557	// printf("block.lba = %d; block.idx = %d\n",block.lba,block.idx);
540	event_block_done(event_show_lba, block);	558	event_block_done(event_show_lba, block);
Lines 659-664 Link Here
659	int hscale = hscaleDVD*drive->media.layers;	677	int hscale = hscaleDVD*drive->media.layers;
660	struct timeval start, finish;	678	struct timeval start, finish;
661		679
		680	int scan_blk = 0;
		681	int blocks_failed = 0;
		682
662	block_data block;	683	block_data block;
663	block.test=TEST_DVD_PIF;	684	block.test=TEST_DVD_PIF;
664	block.err_total=0; block.err_max=0; block.err_min=0; block.err_cur=0; block.err_avg=0.0;	685	block.err_total=0; block.err_max=0; block.err_min=0; block.err_cur=0; block.err_avg=0.0;
Lines 692-698 Link Here
692	for (i=0;oldidx == block.idx;i++){	713	for (i=0;oldidx == block.idx;i++){
693	// block.lba = block.idxhscale+i16;	714	// block.lba = block.idxhscale+i16;
694	oldidx = block.idx;	715	oldidx = block.idx;
695	scan_tbl[drive->ven_ID].pif_1_ecc_block(drive, &block.lba, &current);	716	scan_blk = scan_tbl[drive->ven_ID].pif_1_ecc_block(drive, &block.lba, &current);
		717	switch(scan_blk) {
		718	case SCAN_BLOCK_DONE: break;
		719	case SCAN_BLOCK_FAIL: blocks_failed++; break;
		720	case SCAN_BLOCK_LAST: block.lba = drive->media.capacity; break;
		721	default: break;
		722	}
696	block.idx = block.lba / hscale;	723	block.idx = block.lba / hscale;
697	// printf("block.lba = %d; block.idx = %d\n",block.lba,block.idx);	724	// printf("block.lba = %d; block.idx = %d\n",block.lba,block.idx);
698	event_block_done(event_show_lba, block);	725	event_block_done(event_show_lba, block);

Lines 9-15 Link Here

(-)qpxtool-0.6/qpxtool/version.h (-1 / +1 lines)
9	* See the file "COPYING" for the exact licensing terms.	9	* See the file "COPYING" for the exact licensing terms.
10	*/	10	*/
11		11
12	#define VERSION "0.6"	12	#define VERSION "0.6.0.2"
13	#define LIBVER_MIN_TRANSPORT 0x00000600	13	#define LIBVER_MIN_TRANSPORT 0x00000600
14	#define LIBVER_MIN_SCAN 0x00000600	14	#define LIBVER_MIN_SCAN 0x00000600
15	#define LIBVER_MIN_PLEXTOR 0x00000600	15	#define LIBVER_MIN_PLEXTOR 0x00000600

Return to bug 145445

Lines 1565-1572 Link Here

(-)qpxtool-0.6/qpxtool/QPxTool.cpp (-89 / +89 lines)
1565	if (drive->plextor_silent.access_speed == SILENT_ACCESS_SLOW) access=1;	1565	if (drive->plextor_silent.access_speed == SILENT_ACCESS_SLOW) access=1;
1566	eject=drive->plextor_silent.eject_speed;	1566	eject=drive->plextor_silent.eject_speed;
1567	load=drive->plextor_silent.load_speed;	1567	load=drive->plextor_silent.load_speed;
1568	combo_silent_cd_rd->setEnabled(!drive->media.disc_type & DISC_DVD);	1568	combo_silent_cd_rd->setEnabled(!(drive->media.disc_type & DISC_DVD));
1569	combo_silent_cd_wr->setEnabled(!drive->media.disc_type & DISC_DVD);	1569	combo_silent_cd_wr->setEnabled(!(drive->media.disc_type & DISC_DVD));
1570	combo_silent_dvd_rd->setEnabled((drive->media.disc_type & DISC_DVD));	1570	combo_silent_dvd_rd->setEnabled((drive->media.disc_type & DISC_DVD));
1571	combo_silent_dvd_wr->setEnabled((drive->media.disc_type & DISC_DVD));	1571	combo_silent_dvd_wr->setEnabled((drive->media.disc_type & DISC_DVD));
1572		1572
Lines 2269-2276 Link Here
2269	thread->set_drive(drive);	2269	thread->set_drive(drive);
2270		2270
2271	#ifdef __USE_QTHREAD	2271	#ifdef __USE_QTHREAD
2272	// thread->start(QThread::NormalPriority);	2272	// thread->start(QThread::HighPriority);
2273	thread->start(QThread::HighPriority);	2273	thread->start(QThread::TimeCriticalPriority);
2274	thread_time->start(QThread::NormalPriority);	2274	thread_time->start(QThread::NormalPriority);
2275	#else	2275	#else
2276	pthread_create(drive->test_thread_id, NULL, scan, (void*)thread);	2276	pthread_create(drive->test_thread_id, NULL, scan, (void*)thread);
Lines 3209-3232 Link Here
3209	{	3209	{
3210	fprintf(html,"\t\t\t<table border=\"0\" cellspacing=\"0\" width=\"600\"><tbody><tr>\n");	3210	fprintf(html,"\t\t\t<table border=\"0\" cellspacing=\"0\" width=\"600\"><tbody><tr>\n");
3211	if (drive->media.disc_type & DISC_CD) {	3211	if (drive->media.disc_type & DISC_CD) {
3212	fprintf(html,"\t\t\t\t<td align=\"left\" width=\"5%\"></td>\n");	3212	fprintf(html,"\t\t\t\t<td align=\"left\" width=\"5%%\"></td>\n");
3213	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">10</td>\n");	3213	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">10</td>\n");
3214	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">20</td>\n");	3214	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">20</td>\n");
3215	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">30</td>\n");	3215	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">30</td>\n");
3216	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">40</td>\n");	3216	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">40</td>\n");
3217	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">50</td>\n");	3217	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">50</td>\n");
3218	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">60</td>\n");	3218	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">60</td>\n");
3219	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">70</td>\n");	3219	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">70</td>\n");
3220	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">80</td>\n");	3220	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">80</td>\n");
3221	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%\">90</td>\n");	3221	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"10%%\">90</td>\n");
3222	fprintf(html,"\t\t\t\t<td align=\"right\" width=\"5%\">100</td>\n");	3222	fprintf(html,"\t\t\t\t<td align=\"right\" width=\"5%%\">100</td>\n");
3223	} else {	3223	} else {
3224	fprintf(html,"\t\t\t\t<td align=\"left\" width=\"10%\"></td>\n");	3224	fprintf(html,"\t\t\t\t<td align=\"left\" width=\"10%%\"></td>\n");
3225	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%\">%dG</td>\n",drive->media.layers+1);	3225	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%%\">%dG</td>\n",drive->media.layers+1);
3226	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%\">%dG</td>\n",(drive->media.layers+1)*2);	3226	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%%\">%dG</td>\n",(drive->media.layers+1)*2);
3227	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%\">%dG</td>\n",(drive->media.layers+1)*3);	3227	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%%\">%dG</td>\n",(drive->media.layers+1)*3);
3228	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%\">%dG</td>\n",(drive->media.layers+1)*4);	3228	fprintf(html,"\t\t\t\t<td align=\"center\" width=\"20%%\">%dG</td>\n",(drive->media.layers+1)*4);