From: jsg <jsg@openbsd.org>
Date: Thu, 26 Oct 2023 14:13:37 +0000 (+0000)
Subject: add cd9660
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1091663192bc9c83506fbad280250da558028309;p=openbsd

add cd9660
---

diff --git a/sys/arch/arm64/stand/efiboot/Makefile b/sys/arch/arm64/stand/efiboot/Makefile
index 48c5132f0fa..93e0ce63964 100644
--- a/sys/arch/arm64/stand/efiboot/Makefile
+++ b/sys/arch/arm64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2023/09/06 01:47:36 jsg Exp $
+#	$OpenBSD: Makefile,v 1.22 2023/10/26 14:13:37 jsg Exp $
 
 NOMAN=		#
 
@@ -32,7 +32,7 @@ SRCS+=	alloc.c ctime.c exit.c getchar.c hexdump.c \
 SRCS+=	close.c closeall.c cons.c cread.c dev.c disklabel.c dkcksum.c fchmod.c \
 	fstat.c lseek.c open.c read.c readdir.c stat.c
 SRCS+=	loadfile.c arc4.c
-SRCS+=	ufs.c ufs2.c
+SRCS+=	ufs.c ufs2.c cd9660.c
 SRCS+=	arp.c ether.c globals.c in_cksum.c net.c netif.c netudp.c tftp.c
 SRCS+=	aes_xts.c bcrypt_pbkdf.c blowfish.c explicit_bzero.c hmac_sha1.c \
 	pkcs5_pbkdf2.c rijndael.c sha1.c sha2.c softraid.c
diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c
index a74bf79fac3..770bf2e1a5d 100644
--- a/sys/arch/arm64/stand/efiboot/conf.c
+++ b/sys/arch/arm64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.46 2023/05/12 16:43:00 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.47 2023/10/26 14:13:37 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -33,6 +33,7 @@
 #include <lib/libsa/tftp.h>
 #include <lib/libsa/ufs.h>
 #include <lib/libsa/ufs2.h>
+#include <lib/libsa/cd9660.h>
 #include <dev/cons.h>
 
 #include <dev/biovar.h>
@@ -58,6 +59,8 @@ struct fs_ops file_system[] = {
 	  ufs_stat,    ufs_readdir,  ufs_fchmod },
 	{ ufs2_open,   ufs2_close,   ufs2_read,   ufs2_write,   ufs2_seek,
 	  ufs2_stat,   ufs2_readdir, ufs2_fchmod },
+	{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
+	  cd9660_stat, cd9660_readdir },
 	{ esp_open,    esp_close,    esp_read,    esp_write,    esp_seek,
 	  esp_stat,    esp_readdir,  }
 };