aboutsummaryrefslogtreecommitdiff
path: root/sys/pc98
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2001-12-10 08:09:49 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2001-12-10 08:09:49 +0000
commit6e551fb6285417f585c419500047004ed47c77f1 (patch)
treeb580d740769b3b201f76ad941e8b0b8ca3015bc0 /sys/pc98
parent9d34414bc2a9385fb400e1ca7384bd4c4d1291cd (diff)
Notes
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/cbus/ppc.c22
-rw-r--r--sys/pc98/pc98/ppc.c22
2 files changed, 22 insertions, 22 deletions
diff --git a/sys/pc98/cbus/ppc.c b/sys/pc98/cbus/ppc.c
index 29d8bc45d2d4..b285fce0e391 100644
--- a/sys/pc98/cbus/ppc.c
+++ b/sys/pc98/cbus/ppc.c
@@ -204,7 +204,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
/* XXX 16 and 32 bits implementations not supported */
if (ppc->ppc_pword != PPC_PWORD_8) {
- LOG_PPC(__FUNCTION__, ppc, "PWord not supported");
+ LOG_PPC(__func__, ppc, "PWord not supported");
goto error;
}
@@ -223,7 +223,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
}
if (i >= 1024) {
- LOG_PPC(__FUNCTION__, ppc, "can't flush FIFO");
+ LOG_PPC(__func__, ppc, "can't flush FIFO");
goto error;
}
@@ -246,7 +246,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
}
if (i >= 1024) {
- LOG_PPC(__FUNCTION__, ppc, "can't fill FIFO");
+ LOG_PPC(__func__, ppc, "can't fill FIFO");
goto error;
}
@@ -259,7 +259,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
*/
for (i=ppc->ppc_fifo; i>0; i--) {
if (r_fifo(ppc) != (char)(ppc->ppc_fifo-i)) {
- LOG_PPC(__FUNCTION__, ppc, "invalid data in FIFO");
+ LOG_PPC(__func__, ppc, "invalid data in FIFO");
goto error;
}
if (r_ecr(ppc) & PPC_SERVICE_INTR) {
@@ -268,14 +268,14 @@ ppc_detect_fifo(struct ppc_data *ppc)
}
/* if FIFO empty before the last byte, error */
if (i>1 && (r_ecr(ppc) & PPC_FIFO_EMPTY)) {
- LOG_PPC(__FUNCTION__, ppc, "data lost in FIFO");
+ LOG_PPC(__func__, ppc, "data lost in FIFO");
goto error;
}
}
/* FIFO must be empty after the last byte */
if (!(r_ecr(ppc) & PPC_FIFO_EMPTY)) {
- LOG_PPC(__FUNCTION__, ppc, "can't empty the FIFO");
+ LOG_PPC(__func__, ppc, "can't empty the FIFO");
goto error;
}
@@ -1154,7 +1154,7 @@ found:
printf(" ECP+EPP SPP");
break;
default:
- printf("%s: unknown case (0x%x)!\n", __FUNCTION__, r);
+ printf("%s: unknown case (0x%x)!\n", __func__, r);
}
} else {
@@ -1505,7 +1505,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
case MS_OP_CALL:
if (stack)
- panic("%s: too much calls", __FUNCTION__);
+ panic("%s: too much calls", __func__);
if (mi->arg[0].p) {
/* store the state of the actual
@@ -1539,7 +1539,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
* of a submicrosequence */
if (stack)
panic("%s: can't return to ppb level",
- __FUNCTION__);
+ __func__);
/* update pc for ppb level of execution */
*p_msq = mi;
@@ -1549,7 +1549,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
default:
panic("%s: unknown microsequence opcode 0x%x",
- __FUNCTION__, mi->opcode);
+ __func__, mi->opcode);
}
}
@@ -2132,7 +2132,7 @@ ppc_io(device_t ppcdev, int iop, u_char *addr, int cnt, u_char byte)
w_fifo(ppc, byte);
break;
default:
- panic("%s: unknown I/O operation", __FUNCTION__);
+ panic("%s: unknown I/O operation", __func__);
break;
}
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index 29d8bc45d2d4..b285fce0e391 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/ppc.c
@@ -204,7 +204,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
/* XXX 16 and 32 bits implementations not supported */
if (ppc->ppc_pword != PPC_PWORD_8) {
- LOG_PPC(__FUNCTION__, ppc, "PWord not supported");
+ LOG_PPC(__func__, ppc, "PWord not supported");
goto error;
}
@@ -223,7 +223,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
}
if (i >= 1024) {
- LOG_PPC(__FUNCTION__, ppc, "can't flush FIFO");
+ LOG_PPC(__func__, ppc, "can't flush FIFO");
goto error;
}
@@ -246,7 +246,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
}
if (i >= 1024) {
- LOG_PPC(__FUNCTION__, ppc, "can't fill FIFO");
+ LOG_PPC(__func__, ppc, "can't fill FIFO");
goto error;
}
@@ -259,7 +259,7 @@ ppc_detect_fifo(struct ppc_data *ppc)
*/
for (i=ppc->ppc_fifo; i>0; i--) {
if (r_fifo(ppc) != (char)(ppc->ppc_fifo-i)) {
- LOG_PPC(__FUNCTION__, ppc, "invalid data in FIFO");
+ LOG_PPC(__func__, ppc, "invalid data in FIFO");
goto error;
}
if (r_ecr(ppc) & PPC_SERVICE_INTR) {
@@ -268,14 +268,14 @@ ppc_detect_fifo(struct ppc_data *ppc)
}
/* if FIFO empty before the last byte, error */
if (i>1 && (r_ecr(ppc) & PPC_FIFO_EMPTY)) {
- LOG_PPC(__FUNCTION__, ppc, "data lost in FIFO");
+ LOG_PPC(__func__, ppc, "data lost in FIFO");
goto error;
}
}
/* FIFO must be empty after the last byte */
if (!(r_ecr(ppc) & PPC_FIFO_EMPTY)) {
- LOG_PPC(__FUNCTION__, ppc, "can't empty the FIFO");
+ LOG_PPC(__func__, ppc, "can't empty the FIFO");
goto error;
}
@@ -1154,7 +1154,7 @@ found:
printf(" ECP+EPP SPP");
break;
default:
- printf("%s: unknown case (0x%x)!\n", __FUNCTION__, r);
+ printf("%s: unknown case (0x%x)!\n", __func__, r);
}
} else {
@@ -1505,7 +1505,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
case MS_OP_CALL:
if (stack)
- panic("%s: too much calls", __FUNCTION__);
+ panic("%s: too much calls", __func__);
if (mi->arg[0].p) {
/* store the state of the actual
@@ -1539,7 +1539,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
* of a submicrosequence */
if (stack)
panic("%s: can't return to ppb level",
- __FUNCTION__);
+ __func__);
/* update pc for ppb level of execution */
*p_msq = mi;
@@ -1549,7 +1549,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
default:
panic("%s: unknown microsequence opcode 0x%x",
- __FUNCTION__, mi->opcode);
+ __func__, mi->opcode);
}
}
@@ -2132,7 +2132,7 @@ ppc_io(device_t ppcdev, int iop, u_char *addr, int cnt, u_char byte)
w_fifo(ppc, byte);
break;
default:
- panic("%s: unknown I/O operation", __FUNCTION__);
+ panic("%s: unknown I/O operation", __func__);
break;
}
generated by cgit v1.3 (git 2.53.0) at 2026-07-30 16:49:50 +0000