Deleted Added
full compact
firewire.c (277622) firewire.c (298230)
1/*-
2 * Copyright (c) 2004 Hidetoshi Shimokawa <simokawa@FreeBSD.ORG>
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

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

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
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2004 Hidetoshi Shimokawa <simokawa@FreeBSD.ORG>
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

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

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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/boot/i386/libfirewire/firewire.c 277622 2015-01-23 23:53:56Z will $");
28__FBSDID("$FreeBSD: head/sys/boot/i386/libfirewire/firewire.c 298230 2016-04-18 23:09:22Z allanjude $");
29
30/*
31 * FireWire disk device handling.
32 *
33 */
34
35#include <stand.h>
36

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

61 /* for dcons */
62 struct crom_chunk unit;
63 struct crom_chunk spec;
64 struct crom_chunk ver;
65};
66
67static int fw_init(void);
68static int fw_strategy(void *devdata, int flag, daddr_t dblk,
29
30/*
31 * FireWire disk device handling.
32 *
33 */
34
35#include <stand.h>
36

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

61 /* for dcons */
62 struct crom_chunk unit;
63 struct crom_chunk spec;
64 struct crom_chunk ver;
65};
66
67static int fw_init(void);
68static int fw_strategy(void *devdata, int flag, daddr_t dblk,
69 size_t size, char *buf, size_t *rsize);
69 size_t offset, size_t size, char *buf, size_t *rsize);
70static int fw_open(struct open_file *f, ...);
71static int fw_close(struct open_file *f);
72static void fw_print(int verbose);
73static void fw_cleanup(void);
74
75void fw_enable(void);
76
77struct devsw fwohci = {

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

196 /* invalidate dcons buffer */
197 if (dcons_paddr) {
198 db = (struct dcons_buf *)PTOV(dcons_paddr);
199 db->magic = 0;
200 }
201}
202
203static int
70static int fw_open(struct open_file *f, ...);
71static int fw_close(struct open_file *f);
72static void fw_print(int verbose);
73static void fw_cleanup(void);
74
75void fw_enable(void);
76
77struct devsw fwohci = {

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

196 /* invalidate dcons buffer */
197 if (dcons_paddr) {
198 db = (struct dcons_buf *)PTOV(dcons_paddr);
199 db->magic = 0;
200 }
201}
202
203static int
204fw_strategy(void *devdata, int rw, daddr_t dblk, size_t size, char *buf, size_t *rsize)
204fw_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size,
205 char *buf, size_t *rsize)
205{
206 return (EIO);
207}
208
209static void
210fw_init_crom(struct fwohci_softc *sc)
211{
212 struct crom_src *src;

--- 262 unchanged lines hidden ---
206{
207 return (EIO);
208}
209
210static void
211fw_init_crom(struct fwohci_softc *sc)
212{
213 struct crom_src *src;

--- 262 unchanged lines hidden ---