Changeset 1918 for trunk/src/emx/include/sys/sysctl.h

Timestamp:

Apr 26, 2005, 2:50:14 AM (20 years ago)

Author:

bird

Message:

Hacking public symbols which shouldn't been seen in LIBC.

File:

• trunk/src/emx/include/sys/sysctl.h (modified) (9 diffs, 1 prop)

trunk/src/emx/include/sys/sysctl.h

@@ -36 +36 @@
 /** @file
  * FreeBSD 5.3
+ * @changed bird: Hacked on the kernel stuff.
  */
 
@@ -166 +167 @@
 #define SYSCTL_OUT(r, p, l) (r->oldfunc)(r, p, l)
 
+#ifdef __INNOTEK_LIBC__
+#define sysctl_handle_int       __sysctl_handle_int
+#define sysctl_handle_long      __sysctl_handle_long
+#define sysctl_handle_intptr    __sysctl_handle_intptr
+#define sysctl_handle_string    __sysctl_handle_string
+#define sysctl_handle_opaque    __sysctl_handle_opaque
+#endif
+
 int sysctl_handle_int(SYSCTL_HANDLER_ARGS);
 int sysctl_handle_long(SYSCTL_HANDLER_ARGS);
@@ -172 +181 @@
 int sysctl_handle_opaque(SYSCTL_HANDLER_ARGS);
 
+#if 0 /* bird */
 /*
  * These functions are used to add/remove an oid from the mib.
@@ -177 +187 @@
 void sysctl_register_oid(struct sysctl_oid *oidp);
 void sysctl_unregister_oid(struct sysctl_oid *oidp);
+#endif /* bird */
 
 /* Declare a static oid to allow child oids to be added to it. */
 #define SYSCTL_DECL(name)                                       \
-        extern struct sysctl_oid_list sysctl_##name##_children
+        extern struct sysctl_oid_list __sysctl_##name##_children
 
 /* Hide these in macros */
@@ -188 +199 @@
         (oid_ptr)->oid_arg1 = (val);
 #define SYSCTL_STATIC_CHILDREN(oid_name) \
-        (&sysctl_##oid_name##_children)
+        (&__sysctl_##oid_name##_children)
 
 /* === Structs and macros related to context handling === */
@@ -201 +212 @@
 
 #define SYSCTL_NODE_CHILDREN(parent, name) \
-        sysctl_##parent##_##name##_children
+        __sysctl_##parent##_##name##_children
+
+#undef DATA_SET
+#define DATA_SET(set, data) __asm__ (".stabs \"___" #set "__\", 25, 0, 0, _" #data)
 
 /* This constructs a "raw" MIB oid. */
 #define SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
-        static struct sysctl_oid sysctl__##parent##_##name = {           \
-                &sysctl_##parent##_children, { 0 },                      \
+        static struct sysctl_oid __sysctl__##parent##_##name = {                 \
+                &__sysctl_##parent##_children, { &__sysctl__##parent##_##name },                         \
                 nbr, kind, a1, a2, #name, handler, fmt, 0, descr };      \
-        DATA_SET(sysctl_set, sysctl__##parent##_##name)
+        DATA_SET(sysctl_set, __sysctl__##parent##_##name)
+
 
 #define SYSCTL_ADD_OID(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
@@ -584 +599 @@
  * Declare some common oids.
  */
+#define sysctl__children __sysctl__children
 extern struct sysctl_oid_list sysctl__children;
 SYSCTL_DECL(_kern);
@@ -597 +613 @@
 SYSCTL_DECL(_compat);
 
+#if 0 /* bird  - not used */
 extern char     machine[];
 extern char     osrelease[];
@@ -632 +649 @@
                         int *nindx, struct sysctl_req *req);
 int     sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
+#endif /* bird  - not used */
 
 #else   /* !_KERNEL */