Previous

199869 Revisions

Next

r20110 Sunday 6th January, 2013 at 19:14:29 UTC by Oliver Stöneberg
fixed some cppcheck warnings about format identifiers and duplicated enum (nw)

[src/emu]	emualloc.c
[src/emu/cpu/esrip]	esrip.c
[src/lib/formats]	atarist_dsk.c csw_cas.c d64_dsk.c fdi_dsk.c primoptp.c
[src/lib/util]	chdcd.c jedparse.c

trunk/src/emu/cpu/esrip/esrip.c

r20109	r20110
992	992	TODI  = 0x5
993	993	};
994	994
995		enum
996		{
997		NRY = 0,
998		NRA = 1,
999		NRS = 4,
1000		NRAS = 5,
1001		};
1002
1003	995	UINT16 r = 0;
1004	996	UINT16 s = 0;
1005	997	UINT16   res = 0;

trunk/src/emu/emualloc.c

r20109	r20110
610	610	release_lock();
611	611
612	612	if (total > 0)
613		fprintf(stderr, "a total of %d bytes were not freed\n", total);
	613	fprintf(stderr, "a total of %u bytes were not freed\n", total);
614	614	}

trunk/src/lib/formats/fdi_dsk.c

r20109	r20110
261	261	UINT8 type = header.track[track].type;
262	262	int size = header.track[track].size * 256;
263	263
264		if (LOG) LOG_FORMATS("FDI track %u type %02x size %u offset %u\n", track, type, size, offset);
	264	if (LOG) LOG_FORMATS("FDI track %d type %02x size %d offset %d\n", track, type, size, offset);
265	265
266	266	tag->track_offset[track] = offset;
267	267	tag->track_type[track] = type;

trunk/src/lib/formats/atarist_dsk.c

r20109	r20110
65	65	geometry.tracks = tracks;
66	66	geometry.sectors = sectors;
67	67
68		if (LOG) LOG_FORMATS("ST Heads %u Tracks %u Sectors %u\n", heads, tracks, sectors);
	68	if (LOG) LOG_FORMATS("ST Heads %d Tracks %d Sectors %d\n", heads, tracks, sectors);
69	69
70	70	return basicdsk_construct(floppy, &geometry);
71	71	}

trunk/src/lib/formats/primoptp.c

r20109	r20110
90	90	while (i < length)
91	91	{
92	92	size_in_samples += PRIMO_PAUSE_LENGTH;
93		LOG_FORMATS ("Samples (pause): %d\n", size_in_samples);
	93	LOG_FORMATS ("Samples (pause): %u\n", size_in_samples);
94	94
95	95	size_in_samples += PRIMO_FILE_PILOT_LENGTH;
96		LOG_FORMATS ("Samples (file pilot): %d\n", size_in_samples);
	96	LOG_FORMATS ("Samples (file pilot): %u\n", size_in_samples);
97	97
98	98	/* file size with header */
99	99	file_size = *(b+1) + *(b+2)*256;
100	100	b += 3;
101		LOG_FORMATS ("File size (with header): %d\n", file_size);
	101	LOG_FORMATS ("File size (with header): %u\n", file_size);
102	102
103	103	/* b is now set on the first data byte of file
104	104	it means first byte (type) of block */
r20109	r20110
107	107	while (j < file_size-3)
108	108	{
109	109	size_in_samples += PRIMO_BLOCK_PILOT_LENGTH;
110		LOG_FORMATS ("Samples (block pilot): %d\n", size_in_samples);
	110	LOG_FORMATS ("Samples (block pilot): %u\n", size_in_samples);
111	111
112	112	/* block size without header but including CRC byte */
113	113	block_size = *(b+1) + *(b+2)*256;
r20109	r20110
121	121	size_in_samples += number_of_1 * PRIMO_BIT_1_LENGTH;
122	122	size_in_samples += number_of_0 * PRIMO_BIT_0_LENGTH;
123	123
124		LOG_FORMATS ("Samples (block data): %d\n", size_in_samples);
	124	LOG_FORMATS ("Samples (block data): %u\n", size_in_samples);
125	125
126		LOG_FORMATS ("\tBlock size: %d\n", block_size);
	126	LOG_FORMATS ("\tBlock size: %u\n", block_size);
127	127
128	128	b += block_size;
129	129
r20109	r20110
169	169	file_size = *(b+1) + *(b+2)*256;
170	170	b += 3;
171	171
172		LOG_FORMATS ("File size: %d\n", file_size);
	172	LOG_FORMATS ("File size: %u\n", file_size);
173	173
174	174	/* b is now set on the first data byte of file
175	175	it means first byte (block type) of block header */

trunk/src/lib/formats/csw_cas.c

r20109	r20110
77	77	}
78	78
79	79	SampleRate=get_leuint32(casdata+0x19);
80		LOG_FORMATS("Sample rate %d\n",SampleRate);
	80	LOG_FORMATS("Sample rate %u\n",SampleRate);
81	81
82	82	NumberOfPulses=get_leuint32(casdata+0x1d);
83		LOG_FORMATS("Number Of Pulses %d\n",NumberOfPulses);
	83	LOG_FORMATS("Number Of Pulses %u\n",NumberOfPulses);
84	84
85	85
86	86	CompressionType=casdata[0x21];
87	87	Flags=casdata[0x22];
88	88	HeaderExtensionLength=casdata[0x23];
89	89
90		LOG_FORMATS("CompressionType %d   Flast %d   HeaderExtensionLength %d\n",CompressionType,Flags,HeaderExtensionLength);
	90	LOG_FORMATS("CompressionType %u   Flast %u   HeaderExtensionLength %u\n",CompressionType,Flags,HeaderExtensionLength);
91	91
92	92	mycaslen=caslen;
93	93	//from here on down for now I am assuming it is compressed csw file.
r20109	r20110
189	189	LOG_FORMATS("Length %d\n",length);
190	190
191	191	SampleRate=get_leuint32(bytes+0x19);
192		LOG_FORMATS("Sample rate %d\n",SampleRate);
	192	LOG_FORMATS("Sample rate %u\n",SampleRate);
193	193
194	194	NumberOfPulses=get_leuint32(bytes+0x1d);
195		LOG_FORMATS("Number Of Pulses %d\n",NumberOfPulses);
	195	LOG_FORMATS("Number Of Pulses %u\n",NumberOfPulses);
196	196
197	197	CompressionType=bytes[0x21];
198	198	Flags=bytes[0x22];
r20109	r20110
205	205	Bit=100;
206	206	}
207	207
208		LOG_FORMATS("CompressionType %d   Flast %d   HeaderExtensionLength %d\n",CompressionType,Flags,HeaderExtensionLength);
	208	LOG_FORMATS("CompressionType %u   Flast %u   HeaderExtensionLength %u\n",CompressionType,Flags,HeaderExtensionLength);
209	209
210	210
211	211	//from here on down for now I am assuming it is compressed csw file.

trunk/src/lib/formats/d64_dsk.c

r20109	r20110
279	279
280	280	if (sector_error != ERROR_00)
281	281	{
282		LOG_FORMATS("D64 error %s head %u track %u sector %u\n", ERROR_CODE[sector_error], head, dos_track, sector);
	282	LOG_FORMATS("D64 error %s head %d track %d sector %d\n", ERROR_CODE[sector_error], head, dos_track, sector);
283	283	}
284	284
285	285	return sector_error;
r20109	r20110
725	725	tag->has_errors = has_errors;
726	726
727	727	LOG_FORMATS("D64 size: %04x\n", (UINT32)floppy_image_size(floppy));
728		LOG_FORMATS("D64 heads: %u\n", heads);
729		LOG_FORMATS("D64 tracks: %u\n", dos_tracks);
	728	LOG_FORMATS("D64 heads: %d\n", heads);
	729	LOG_FORMATS("D64 tracks: %d\n", dos_tracks);
730	730	LOG_FORMATS("D64 DOS version: %s\n", DOS_VERSION[dos]);
731	731	LOG_FORMATS("D64 error codes: %s\n", has_errors ? "yes" : "no");
732	732
r20109	r20110
761	761	/* also store an error entry for each sector */
762	762	errors_size += DOS25_SECTORS_PER_TRACK[track];
763	763
764		LOG_FORMATS("D64 head %u track %u offset %05x", head, track + 1, tag->track_offset[head][track]);
	764	LOG_FORMATS("D64 head %d track %d offset %05x", head, track + 1, tag->track_offset[head][track]);
765	765	if (has_errors) LOG_FORMATS(" errors %05x", tag->error_offset[head][track]);
766	766	LOG_FORMATS(" speed %u\n", tag->speed_zone[track]);
767	767	}
r20109	r20110
793	793	errors_size += DOS2_SECTORS_PER_TRACK[track / 2];
794	794	}
795	795
796		LOG_FORMATS("D64 head %u track %.1f offset %05x", head, get_dos_track(track), tag->track_offset[head][track]);
	796	LOG_FORMATS("D64 head %d track %.1f offset %05x", head, get_dos_track(track), tag->track_offset[head][track]);
797	797	if (has_errors) LOG_FORMATS(" errors %05x", tag->error_offset[head][track]);
798	798	LOG_FORMATS(" speed %u\n", tag->speed_zone[track]);
799	799	}
r20109	r20110
821	821	/* read errors */
822	822	if (tag->has_errors)
823	823	{
824		LOG_FORMATS("D64 error blocks: %u %u\n", errors_size, track_offset);
	824	LOG_FORMATS("D64 error blocks: %d %d\n", errors_size, track_offset);
825	825	floppy_image_read(floppy, tag->error, track_offset, errors_size);
826	826	}
827	827	else

trunk/src/lib/util/jedparse.c

r20109	r20110
181	181	/* read the fuse number */
182	182	cursrc++;
183	183	curfuse = suck_number(&cursrc);
184		if (LOG_PARSE) printf("L%d\n", curfuse);
	184	if (LOG_PARSE) printf("L%u\n", curfuse);
185	185
186	186	/* read digits, skipping delimiters */
187	187	for ( ; cursrc < srcend; cursrc++)
188	188	if (*cursrc == '0' || *cursrc == '1')
189	189	{
190	190	jed_set_fuse(data, curfuse, *cursrc - '0');
191		if (LOG_PARSE) printf("  fuse %d = %d\n", curfuse, 0);
	191	if (LOG_PARSE) printf("  fuse %u = %d\n", curfuse, 0);
192	192	if (curfuse >= data->numfuses)
193	193	data->numfuses = curfuse + 1;
194	194	curfuse++;

trunk/src/lib/util/chdcd.c

r20109	r20110
229	229	if (temp16 != 1)
230	230	{
231	231	osd_close(file);
232		printf("ERROR: unsupported format %d - only PCM is supported (%s)\n", temp16, filename);
	232	printf("ERROR: unsupported format %u - only PCM is supported (%s)\n", temp16, filename);
233	233	return 0;
234	234	}
235	235
r20109	r20110
240	240	if (temp16 != 2)
241	241	{
242	242	osd_close(file);
243		printf("ERROR: unsupported number of channels %d - only stereo is supported (%s)\n", temp16, filename);
	243	printf("ERROR: unsupported number of channels %u - only stereo is supported (%s)\n", temp16, filename);
244	244	return 0;
245	245	}
246	246
r20109	r20110
265	265	if (bits != 16)
266	266	{
267	267	osd_close(file);
268		printf("ERROR: unsupported bits/sample %d - only 16 is supported (%s)\n", bits, filename);
	268	printf("ERROR: unsupported bits/sample %u - only 16 is supported (%s)\n", bits, filename);
269	269	return 0;
270	270	}
271	271

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team