mirror of
https://git.freebsd.org/ports.git
synced 2025-06-02 19:36:28 -04:00
0a90d3d9f9
* Remove MAJE_JOBS_UNSAFE, fixed upstream with additional make dependencies. * Remove local copy of opencbm(4), manpage was adopted upstream. * Also affects opencbm-kmod and opencbm-plugin-xa1541. Changelog: https://opencbm.trikaliotis.net/opencbm-6.html Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D36031
34 lines
1,018 B
Text
34 lines
1,018 B
Text
From 6e438c1b32d39e5238f65246e192c89b22fdfd82 Mon Sep 17 00:00:00 2001
|
|
From: John Baldwin <jhb@FreeBSD.org>
|
|
Date: Fri, 20 May 2022 17:10:09 +0000
|
|
Subject: [PATCH] FreeBSD kernel driver: compat with 14-CURRENT
|
|
|
|
In 14-CURRENT (upcoming major release), there was a slight change to the
|
|
driver API at version 1400058.
|
|
|
|
Add conditional code to retain compatibility.
|
|
--- opencbm.c.orig 2022-01-22 22:01:25 UTC
|
|
+++ opencbm.c
|
|
@@ -133,8 +133,6 @@ static struct cdevsw cbm_cdevsw = {
|
|
.d_name = CBM_NAME
|
|
};
|
|
|
|
-static devclass_t cbm_devclass;
|
|
-
|
|
/* forward references for parallel burst routines */
|
|
int cbm_parallel_burst_read_track(struct cbm_data *sc, device_t ppbus,
|
|
unsigned char *buffer);
|
|
@@ -930,7 +928,13 @@ static driver_t cbm_driver = {
|
|
sizeof(struct cbm_data)
|
|
};
|
|
|
|
+#if __FreeBSD_version >= 1400058
|
|
+DRIVER_MODULE(cbm, ppbus, cbm_driver, 0, 0);
|
|
+#else
|
|
+static devclass_t cbm_devclass;
|
|
+
|
|
DRIVER_MODULE(cbm, ppbus, cbm_driver, cbm_devclass, 0, 0);
|
|
+#endif
|
|
MODULE_DEPEND(cbm, ppbus, 1, 1, 1);
|
|
|
|
/*
|