Thu Apr 18 10:32:03 2024 UTC (22d)
s/resoure/resource/ in comments.


(andvar)
diff -r1.19 -r1.20 src/sys/arch/mac68k/mac68k/macrom.h
diff -r1.71 -r1.72 src/sys/net/if_media.h
cvs diff -r1.19 -r1.20 src/sys/arch/mac68k/mac68k/macrom.h (expand / switch to unified diff)

--- src/sys/arch/mac68k/mac68k/macrom.h 2009/11/01 01:51:35 1.19
+++ src/sys/arch/mac68k/mac68k/macrom.h 2024/04/18 10:32:03 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: macrom.h,v 1.19 2009/11/01 01:51:35 snj Exp $ */ 1/* $NetBSD: macrom.h,v 1.20 2024/04/18 10:32:03 andvar Exp $ */
2 2
3/*- 3/*-
4 * Copyright (C) 1994 Bradley A. Grantham 4 * Copyright (C) 1994 Bradley A. Grantham
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -143,27 +143,27 @@ extern u_char mrg_ResError[]; @@ -143,27 +143,27 @@ extern u_char mrg_ResError[];
143#define noErr 0 143#define noErr 0
144#define memFullErr -108 144#define memFullErr -108
145#define memWZErr -111 145#define memWZErr -111
146#define resNotFound -192 146#define resNotFound -192
147 147
148 148
149 /* Dump instruction trace */ 149 /* Dump instruction trace */
150void dumptrace(void); 150void dumptrace(void);
151 151
152 152
153 /* Stuff for configuring ROM Glue */ 153 /* Stuff for configuring ROM Glue */
154typedef struct rsrc_s { 154typedef struct rsrc_s {
155 u_int16_t unknown[4]; /* ???? */ 155 u_int16_t unknown[4]; /* ???? */
156 u_int32_t next; /* pointer to next resoure in list */ 156 u_int32_t next; /* pointer to next resource in list */
157 u_int32_t body; /* pointer to resource body? */ 157 u_int32_t body; /* pointer to resource body? */
158 u_int32_t name; /* resource name */ 158 u_int32_t name; /* resource name */
159 u_int16_t index; /* ???? */ 159 u_int16_t index; /* ???? */
160} rsrc_t; 160} rsrc_t;
161 161
162typedef struct romvec_s { 162typedef struct romvec_s {
163 const char *romident; /* just to print it out */ 163 const char *romident; /* just to print it out */
164 void *adbintr; /* where is ADB interrupt */ 164 void *adbintr; /* where is ADB interrupt */
165 void *pmintr; /* where is ADB/PM interrupt, on machines */ 165 void *pmintr; /* where is ADB/PM interrupt, on machines */
166 /* that have it */ 166 /* that have it */
167 void *adb130intr; /* ADBBase[0x130] interrupt; don't know */ 167 void *adb130intr; /* ADBBase[0x130] interrupt; don't know */
168 /* what it is, but it's important. Don't */ 168 /* what it is, but it's important. Don't */
169 /* you love reverse engineering? */ 169 /* you love reverse engineering? */
cvs diff -r1.71 -r1.72 src/sys/net/if_media.h (expand / switch to unified diff)

--- src/sys/net/if_media.h 2020/03/15 23:04:51 1.71
+++ src/sys/net/if_media.h 2024/04/18 10:32:03 1.72
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_media.h,v 1.71 2020/03/15 23:04:51 thorpej Exp $ */ 1/* $NetBSD: if_media.h,v 1.72 2024/04/18 10:32:03 andvar Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998, 2000, 2001, 2020 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2000, 2001, 2020 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center. 9 * NASA Ames Research Center.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -971,27 +971,27 @@ do { \ @@ -971,27 +971,27 @@ do { \
971 971
972#define IFMEDIA_UNLOCK_FOR_LEGACY(ifm) \ 972#define IFMEDIA_UNLOCK_FOR_LEGACY(ifm) \
973do { \ 973do { \
974 if (ifmedia_islegacy(ifm)) \ 974 if (ifmedia_islegacy(ifm)) \
975 ifmedia_unlock_for_legacy(ifm); \ 975 ifmedia_unlock_for_legacy(ifm); \
976} while (/*CONSTCOND*/0) 976} while (/*CONSTCOND*/0)
977#endif /* __IFMEDIA_PRIVATE */ 977#endif /* __IFMEDIA_PRIVATE */
978 978
979/* Initialize an interface's struct if_media field. */ 979/* Initialize an interface's struct if_media field. */
980void ifmedia_init(struct ifmedia *, int, ifm_change_cb_t, ifm_stat_cb_t); 980void ifmedia_init(struct ifmedia *, int, ifm_change_cb_t, ifm_stat_cb_t);
981void ifmedia_init_with_lock(struct ifmedia *, int, ifm_change_cb_t, 981void ifmedia_init_with_lock(struct ifmedia *, int, ifm_change_cb_t,
982 ifm_stat_cb_t, kmutex_t *); 982 ifm_stat_cb_t, kmutex_t *);
983 983
984/* Release resourecs associated with an ifmedia. */ 984/* Release resources associated with an ifmedia. */
985void ifmedia_fini(struct ifmedia *); 985void ifmedia_fini(struct ifmedia *);
986 986
987 987
988/* Add one supported medium to a struct ifmedia. */ 988/* Add one supported medium to a struct ifmedia. */
989void ifmedia_add(struct ifmedia *, int, int, void *); 989void ifmedia_add(struct ifmedia *, int, int, void *);
990 990
991/* Add an array (of ifmedia_entry) media to a struct ifmedia. */ 991/* Add an array (of ifmedia_entry) media to a struct ifmedia. */
992void ifmedia_list_add(struct ifmedia *, struct ifmedia_entry *, int); 992void ifmedia_list_add(struct ifmedia *, struct ifmedia_entry *, int);
993 993
994/* Set default media type on initialization. */ 994/* Set default media type on initialization. */
995void ifmedia_set(struct ifmedia *ifm, int mword); 995void ifmedia_set(struct ifmedia *ifm, int mword);
996 996
997/* Common ioctl function for getting/setting media, called by driver. */ 997/* Common ioctl function for getting/setting media, called by driver. */