Deleted Added
sdiff udiff text old ( 170878 ) new ( 188029 )
full compact
fwdv.c (170878) fwdv.c (188029)
1/*
2 * Copyright (C) 2003
3 * Hidetoshi Shimokawa. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
1/*
2 * Copyright (C) 2003
3 * Hidetoshi Shimokawa. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $FreeBSD: head/usr.sbin/fwcontrol/fwdv.c 170878 2007-06-17 10:20:55Z simokawa $
34 * $FreeBSD: head/usr.sbin/fwcontrol/fwdv.c 188029 2009-02-02 21:05:12Z sbruno $
35 */
36#include <sys/param.h>
37#include <sys/ioctl.h>
38#include <sys/time.h>
39#include <sys/types.h>
40#include <sys/uio.h>
41
42#if __FreeBSD_version >= 500000

--- 154 unchanged lines hidden (view full) ---

197 fprintf(stderr, "%s\n", system_name[system]);
198 }
199
200 /* Fix DSF bit */
201 if (system == 1 &&
202 (dv->payload[0] & DV_DSF_12) == 0)
203 dv->payload[0] |= DV_DSF_12;
204 nb = nblocks[system];
35 */
36#include <sys/param.h>
37#include <sys/ioctl.h>
38#include <sys/time.h>
39#include <sys/types.h>
40#include <sys/uio.h>
41
42#if __FreeBSD_version >= 500000

--- 154 unchanged lines hidden (view full) ---

197 fprintf(stderr, "%s\n", system_name[system]);
198 }
199
200 /* Fix DSF bit */
201 if (system == 1 &&
202 (dv->payload[0] & DV_DSF_12) == 0)
203 dv->payload[0] |= DV_DSF_12;
204 nb = nblocks[system];
205 fprintf(stderr, "%d", k%10);
205 fprintf(stderr, "%d:%02d:%02d %d\r",
206 k / (3600 * frame_rate[system]),
207 (k / (60 * frame_rate[system])) % 60,
208 (k / frame_rate[system]) % 60,
209 k % frame_rate[system]);
210
206#if FIX_FRAME
207 if (m > 0 && m != nb) {
208 /* padding bad frame */
209 npad = ((nb - m) % nb);
210 if (npad < 0)
211 npad += nb;
211#if FIX_FRAME
212 if (m > 0 && m != nb) {
213 /* padding bad frame */
214 npad = ((nb - m) % nb);
215 if (npad < 0)
216 npad += nb;
212 fprintf(stderr, "(%d blocks padded)",
213 npad);
217 fprintf(stderr, "\n%d blocks padded\n",
218 npad);
214 npad *= DSIZE;
215 wbuf[vec].iov_base = pad;
216 wbuf[vec++].iov_len = npad;
217 if (vec >= NPACKET_R) {
218 writev(fd, wbuf, vec);
219 vec = 0;
220 }
221 }
222#endif
223 k++;
219 npad *= DSIZE;
220 wbuf[vec].iov_base = pad;
221 wbuf[vec++].iov_len = npad;
222 if (vec >= NPACKET_R) {
223 writev(fd, wbuf, vec);
224 vec = 0;
225 }
226 }
227#endif
228 k++;
224 if (k % frame_rate[system] == 0) {
225 /* every second */
226 fprintf(stderr, "\n");
227 }
228 fflush(stderr);
229 m = 0;
230 }
231 if (k == 0 || (count > 0 && k > count))
232 continue;
233 m++;
234 wbuf[vec].iov_base = (char *) dv;
235 wbuf[vec++].iov_len = DSIZE;

--- 4 unchanged lines hidden (view full) ---

240 }
241 ptr = (u_int32_t *)dv;
242next:
243 if ((char *)ptr < buf + tlen)
244 goto again;
245 if (vec > 0)
246 writev(fd, wbuf, vec);
247 }
229 fflush(stderr);
230 m = 0;
231 }
232 if (k == 0 || (count > 0 && k > count))
233 continue;
234 m++;
235 wbuf[vec].iov_base = (char *) dv;
236 wbuf[vec++].iov_len = DSIZE;

--- 4 unchanged lines hidden (view full) ---

241 }
242 ptr = (u_int32_t *)dv;
243next:
244 if ((char *)ptr < buf + tlen)
245 goto again;
246 if (vec > 0)
247 writev(fd, wbuf, vec);
248 }
248 if(fd != STDOUT_FILENO) {
249 if (fd != STDOUT_FILENO)
249 close(fd);
250 close(fd);
250 }
251 fprintf(stderr, "\n");
252}
253
254
255void
256dvsend(int d, const char *filename, char ich, int count)
257{
258 struct fw_isochreq isoreq;

--- 160 unchanged lines hidden --- 		251 fprintf(stderr, "\n");
252}
253
254
255void
256dvsend(int d, const char *filename, char ich, int count)
257{
258 struct fw_isochreq isoreq;

--- 160 unchanged lines hidden ---