Changeset 6cfc98d in rtems-libbsd
- Timestamp:
- 10/01/14 12:20:42 (9 years ago)
- Branches:
- 4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master
- Children:
- 263c947
- Parents:
- d43544e
- git-author:
- Sebastian Huber <sebastian.huber@…> (10/01/14 12:20:42)
- git-committer:
- Sebastian Huber <sebastian.huber@…> (10/08/14 12:59:52)
- Files:
-
- 7 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
Makefile
rd43544e r6cfc98d 110 110 LIB_C_FILES += rtemsbsd/telnetd/pty.c 111 111 LIB_C_FILES += rtemsbsd/telnetd/telnetd.c 112 LIB_C_FILES += rtemsbsd/bsp/bsp-bsd-nexus-devices.c113 112 LIB_GEN_FILES += rtemsbsd/rtems/rtems-kvm-symbols.c 114 113 LIB_C_FILES += rtemsbsd/rtems/rtems-kvm-symbols.c -
freebsd-to-rtems.py
rd43544e r6cfc98d 708 708 'telnetd/pty.c', 709 709 'telnetd/telnetd.c', 710 'bsp/bsp-bsd-nexus-devices.c',711 710 ] 712 711 ) -
rtemsbsd/include/bsp/nexus-devices.h
rd43544e r6cfc98d 1 1 /* 2 * Copyright (c) 2013 embedded brains GmbH. All rights reserved.2 * Copyright (c) 2013-2014 embedded brains GmbH. All rights reserved. 3 3 * 4 4 * embedded brains GmbH … … 32 32 #include <rtems/bsd/bsd.h> 33 33 34 #include <machine/rtems-bsd-sysinit.h>35 36 34 #include <bsp.h> 37 35 … … 52 50 }; 53 51 54 const rtems_bsd_device rtems_bsd_nexus_devices[] = { 55 { 56 .name = "smc", 57 .unit = 0, 58 .resource_count = RTEMS_ARRAY_SIZE(smc0_res), 59 .resources = &smc0_res[0] 60 } 61 }; 62 63 SYSINIT_DRIVER_REFERENCE(smc, nexus); 52 RTEMS_BSD_DEFINE_NEXUS_DEVICE(smc, 0, RTEMS_ARRAY_SIZE(smc0_res), 53 &smc0_res[0]); 64 54 65 55 #elif defined(__GENMCF548X_BSP_H) 66 56 67 const rtems_bsd_device rtems_bsd_nexus_devices[] = { 68 { 69 .name = "fec", 70 .unit = 0 71 }, { 72 .name = "fec", 73 .unit = 1 74 } 75 }; 57 RTEMS_BSD_DEFINE_NEXUS_DEVICE(fec, 0, 0, NULL); 76 58 77 SYSINIT_DRIVER_REFERENCE(fec, nexus); 78 79 #else 80 81 const rtems_bsd_device rtems_bsd_nexus_devices[0]; 59 RTEMS_BSD_DEFINE_NEXUS_DEVICE(fec, 1, 0, NULL); 82 60 83 61 #endif 84 85 const size_t rtems_bsd_nexus_device_count =86 RTEMS_ARRAY_SIZE(rtems_bsd_nexus_devices); -
rtemsbsd/include/rtems/bsd/bsd.h
rd43544e r6cfc98d 41 41 #define _RTEMS_BSD_BSD_H_ 42 42 43 #include <sys/cdefs.h> 44 #include <sys/queue.h> 45 #include <sys/kernel.h> 46 47 #include <rtems.h> 48 43 49 #ifdef __cplusplus 44 50 extern "C" { 45 51 #endif /* __cplusplus */ 46 47 #include <rtems.h>48 52 49 53 typedef enum { … … 63 67 size_t resource_count; 64 68 const rtems_bsd_device_resource *resources; 69 const struct sysinit *driver_reference; 65 70 } rtems_bsd_device; 66 71 67 extern const rtems_bsd_device rtems_bsd_nexus_devices[]; 68 69 extern const size_t rtems_bsd_nexus_device_count; 72 #define RTEMS_BSD_DEFINE_NEXUS_DEVICE(name, unit, resource_count, resources) \ 73 extern struct sysinit SYSINIT_ENTRY_NAME(name##_nexusmodule); \ 74 RTEMS_BSD_DEFINE_SET_ITEM(nexus, name##unit, rtems_bsd_device) = \ 75 { #name, unit, (resource_count), (resources), \ 76 &SYSINIT_ENTRY_NAME(name##_nexusmodule) } 70 77 71 78 rtems_status_code rtems_bsd_initialize(void); -
rtemsbsd/rtems/rtems-bsd-nexus.c
rd43544e r6cfc98d 8 8 9 9 /* 10 * Copyright (c) 2009-201 3embedded brains GmbH. All rights reserved.10 * Copyright (c) 2009-2014 embedded brains GmbH. All rights reserved. 11 11 * 12 12 * embedded brains GmbH … … 55 55 /* #define DISABLE_INTERRUPT_EXTENSION */ 56 56 57 RTEMS_BSD_DECLARE_SET(nexus, rtems_bsd_device); 58 59 RTEMS_BSD_DEFINE_SET(nexus, rtems_bsd_device); 60 57 61 RTEMS_STATIC_ASSERT(SYS_RES_MEMORY == RTEMS_BSD_RES_MEMORY, RTEMS_BSD_RES_MEMORY); 58 62 … … 68 72 rtems_status_code status; 69 73 int err; 70 size_t i;74 const rtems_bsd_device *nd; 71 75 72 76 device_set_desc(dev, "RTEMS Nexus device"); … … 101 105 BSD_ASSERT(err == 0); 102 106 103 for (i = 0; i < rtems_bsd_nexus_device_count; ++i) { 104 const rtems_bsd_device *nd = &rtems_bsd_nexus_devices[i]; 105 107 SET_FOREACH(nd, nexus) { 106 108 device_add_child(dev, nd->name, nd->unit); 107 109 } … … 134 136 { 135 137 struct rman *rm; 136 size_t i;138 const rtems_bsd_device *nd; 137 139 138 140 switch (type) { … … 147 149 } 148 150 149 for (i = 0; i < rtems_bsd_nexus_device_count; ++i) { 150 const rtems_bsd_device *nd = &rtems_bsd_nexus_devices[i]; 151 151 SET_FOREACH(nd, nexus) { 152 152 if (strcmp(device_get_name(child), nd->name) == 0 153 153 && device_get_unit(child) == nd->unit) { -
testsuite/include/rtems/bsd/test/default-network-init.h
rd43544e r6cfc98d 273 273 SYSINIT_NEED_NET_PF_UNIX; 274 274 275 #include <bsp/nexus-devices.h> 276 275 277 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER 276 278 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -
testsuite/swi01/init.c
rd43544e r6cfc98d 40 40 #include "swi_test.h" 41 41 42 const rtems_bsd_device rtems_bsd_nexus_devices[0];43 44 const size_t rtems_bsd_nexus_device_count =45 RTEMS_ARRAY_SIZE(rtems_bsd_nexus_devices);46 47 42 static void Init(rtems_task_argument arg) 48 43 { -
testsuite/timeout01/init.c
rd43544e r6cfc98d 40 40 #include "timeout_test.h" 41 41 42 const rtems_bsd_device rtems_bsd_nexus_devices[0];43 44 const size_t rtems_bsd_nexus_device_count =45 RTEMS_ARRAY_SIZE(rtems_bsd_nexus_devices);46 47 42 static void Init(rtems_task_argument arg) 48 43 {
Note: See TracChangeset
for help on using the changeset viewer.