Deleted Added
full compact
mkimg.h (268236) mkimg.h (271881)
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * 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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * 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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.bin/mkimg/mkimg.h 268236 2014-07-03 20:31:43Z marcel $
26 * $FreeBSD: head/usr.bin/mkimg/mkimg.h 271881 2014-09-19 23:16:02Z marcel $
27 */
28
29#ifndef _MKIMG_MKIMG_H_
30#define _MKIMG_MKIMG_H_
31
32#include <sys/queue.h>
33
34struct part {

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

61
62static inline lba_t
63round_block(lba_t n)
64{
65 lba_t b = blksz / secsz;
66 return ((n + b - 1) & ~(b - 1));
67}
68
27 */
28
29#ifndef _MKIMG_MKIMG_H_
30#define _MKIMG_MKIMG_H_
31
32#include <sys/queue.h>
33
34struct part {

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

61
62static inline lba_t
63round_block(lba_t n)
64{
65 lba_t b = blksz / secsz;
66 return ((n + b - 1) & ~(b - 1));
67}
68
69static inline lba_t
70round_cylinder(lba_t n)
71{
72 u_int cyl = nsecs * nheads;
73 u_int r = n % cyl;
74 return ((r == 0) ? n : n + cyl - r);
75}
76
77static inline lba_t
78round_track(lba_t n)
79{
80 u_int r = n % nsecs;
81 return ((r == 0) ? n : n + nsecs - r);
82}
83
69#if !defined(SPARSE_WRITE)
70#define sparse_write write
71#else
72ssize_t sparse_write(int, const void *, size_t);
73#endif
74
75struct uuid;
76void mkimg_uuid(struct uuid *);
77
78#endif /* _MKIMG_MKIMG_H_ */
84#if !defined(SPARSE_WRITE)
85#define sparse_write write
86#else
87ssize_t sparse_write(int, const void *, size_t);
88#endif
89
90struct uuid;
91void mkimg_uuid(struct uuid *);
92
93#endif /* _MKIMG_MKIMG_H_ */