Deleted Added
full compact
iso.h (12158) iso.h (12453)
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)iso.h 8.2 (Berkeley) 1/23/94
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)iso.h 8.2 (Berkeley) 1/23/94
39 * $Id: iso.h,v 1.7 1995/10/31 12:13:49 phk Exp $
39 * $Id: iso.h,v 1.8 1995/11/09 08:13:35 bde Exp $
40 */
41
42#define ISODCL(from, to) (to - from + 1)
43
44struct iso_volume_descriptor {
45 char type[ISODCL(1,1)]; /* 711 */
46 char id[ISODCL(2,6)];
47 char version[ISODCL(7,7)];

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

207
208#define iso_blkoff(imp, loc) ((loc) & (imp)->im_bmask)
209#define iso_lblkno(imp, loc) ((loc) >> (imp)->im_bshift)
210#define iso_blksize(imp, ip, lbn) ((imp)->logical_block_size)
211#define iso_lblktosize(imp, blk) ((blk) << (imp)->im_bshift)
212#define iso_lblktodaddr(imp, lbn) btodb(iso_lblktosize(imp, lbn))
213#define iso_dblkinc(imp, lbn) ((lbn) + iso_lblktodaddr(imp, 1))
214#define iso_dblkno(imp, loc) iso_lblktodaddr(imp, iso_lblkno(imp, loc))
40 */
41
42#define ISODCL(from, to) (to - from + 1)
43
44struct iso_volume_descriptor {
45 char type[ISODCL(1,1)]; /* 711 */
46 char id[ISODCL(2,6)];
47 char version[ISODCL(7,7)];

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

207
208#define iso_blkoff(imp, loc) ((loc) & (imp)->im_bmask)
209#define iso_lblkno(imp, loc) ((loc) >> (imp)->im_bshift)
210#define iso_blksize(imp, ip, lbn) ((imp)->logical_block_size)
211#define iso_lblktosize(imp, blk) ((blk) << (imp)->im_bshift)
212#define iso_lblktodaddr(imp, lbn) btodb(iso_lblktosize(imp, lbn))
213#define iso_dblkinc(imp, lbn) ((lbn) + iso_lblktodaddr(imp, 1))
214#define iso_dblkno(imp, loc) iso_lblktodaddr(imp, iso_lblkno(imp, loc))
215int cd9660_init __P(());
215int cd9660_init __P((void));
216
217struct iso_node;
218int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp));
219int iso_iget __P((struct iso_node *xp, ino_t ino, int relocated,
220 struct iso_node **ipp, struct iso_directory_record *isodir));
221int iso_iput __P((struct iso_node *ip));
222int iso_ilock __P((struct iso_node *ip));
223int iso_iunlock __P((struct iso_node *ip));
224int cd9660_mountroot __P((void));
225
226extern vop_t **cd9660_vnodeop_p;
227
216
217struct iso_node;
218int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp));
219int iso_iget __P((struct iso_node *xp, ino_t ino, int relocated,
220 struct iso_node **ipp, struct iso_directory_record *isodir));
221int iso_iput __P((struct iso_node *ip));
222int iso_ilock __P((struct iso_node *ip));
223int iso_iunlock __P((struct iso_node *ip));
224int cd9660_mountroot __P((void));
225
226extern vop_t **cd9660_vnodeop_p;
227
228static int isonum_711 __P((unsigned char *p));
229static int isonum_712 __P((char *p));
230static int isonum_721 __P((unsigned char *p));
231static int isonum_722 __P((unsigned char *p));
232static int isonum_723 __P((unsigned char *p));
233static int isonum_731 __P((unsigned char *p));
234static int isonum_732 __P((unsigned char *p));
235static int isonum_733 __P((unsigned char *p));
236
228static inline int
229isonum_711(p)
230 unsigned char *p;
231{
232 return *p;
233}
234
235static inline int

--- 56 unchanged lines hidden ---
237static inline int
238isonum_711(p)
239 unsigned char *p;
240{
241 return *p;
242}
243
244static inline int

--- 56 unchanged lines hidden ---