| /branches/dynload/kernel/generic/include/align.h |
|---|
| 26,13 → 26,13 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup generic |
| /** @addtogroup generic |
| * @ingroup others |
| * @{ |
| */ |
| /** |
| * @file |
| * @brief Macros for making values and addresses aligned. |
| * @brief Macros for making values and addresses aligned. |
| */ |
| #ifndef KERN_ALIGN_H_ |
| 43,7 → 43,7 |
| * @param s Address or size to be aligned. |
| * @param a Size of alignment, must be power of 2. |
| */ |
| #define ALIGN_DOWN(s, a) ((s) & ~((a) - 1)) |
| #define ALIGN_DOWN(s, a) ((s) & ~((a) - 1)) |
| /** Align to the nearest higher address. |
| 51,7 → 51,7 |
| * @param s Address or size to be aligned. |
| * @param a Size of alignment, must be power of 2. |
| */ |
| #define ALIGN_UP(s, a) (((s) + ((a) - 1)) & ~((a) - 1)) |
| #define ALIGN_UP(s, a) (((s) + ((a) - 1)) & ~((a) - 1)) |
| #endif |
| /branches/dynload/kernel/generic/include/config.h |
|---|
| 40,11 → 40,14 |
| #define STACK_SIZE PAGE_SIZE |
| #define CONFIG_INIT_TASKS 32 |
| #define CONFIG_INIT_TASKS 32 |
| #define CONFIG_TASK_NAME_BUFLEN 32 |
| typedef struct { |
| uintptr_t addr; |
| size_t size; |
| char name[CONFIG_TASK_NAME_BUFLEN]; |
| } init_task_t; |
| typedef struct { |
| /branches/dynload/kernel/generic/include/proc/task.h |
|---|
| 144,6 → 144,7 |
| #endif |
| extern unative_t sys_task_get_id(task_id_t *uspace_task_id); |
| extern unative_t sys_task_set_name(const char *uspace_name, size_t name_len); |
| #endif |
| /branches/dynload/kernel/generic/include/main/main.h |
|---|
| 35,8 → 35,13 |
| #ifndef KERN_MAIN_H_ |
| #define KERN_MAIN_H_ |
| #include <arch/types.h> |
| extern uintptr_t stack_safe; |
| extern void main_bsp(void); |
| extern void main_ap(void); |
| #endif |
| /** @} |
| /branches/dynload/kernel/generic/include/ddi/irq.h |
|---|
| 36,16 → 36,16 |
| #define KERN_IRQ_H_ |
| typedef enum { |
| CMD_MEM_READ_1 = 0, |
| CMD_MEM_READ_2, |
| CMD_MEM_READ_4, |
| CMD_MEM_READ_8, |
| CMD_MEM_WRITE_1, |
| CMD_MEM_WRITE_2, |
| CMD_MEM_WRITE_4, |
| CMD_MEM_WRITE_8, |
| CMD_PORT_READ_1, |
| CMD_PORT_WRITE_1, |
| CMD_PIO_READ_8 = 1, |
| CMD_PIO_READ_16, |
| CMD_PIO_READ_32, |
| CMD_PIO_WRITE_8, |
| CMD_PIO_WRITE_16, |
| CMD_PIO_WRITE_32, |
| CMD_BTEST, |
| CMD_PREDICATE, |
| CMD_ACCEPT, |
| CMD_DECLINE, |
| CMD_LAST |
| } irq_cmd_type; |
| 52,8 → 52,9 |
| typedef struct { |
| irq_cmd_type cmd; |
| void *addr; |
| unsigned long long value; |
| int dstarg; |
| unsigned long long value; |
| unsigned int srcarg; |
| unsigned int dstarg; |
| } irq_cmd_t; |
| typedef struct { |
| 65,8 → 66,10 |
| #include <arch/types.h> |
| #include <adt/list.h> |
| #include <adt/hash_table.h> |
| #include <synch/spinlock.h> |
| #include <proc/task.h> |
| #include <ipc/ipc.h> |
| typedef enum { |
| IRQ_DECLINE, /**< Decline to service. */ |
| 96,6 → 99,8 |
| answerbox_t *answerbox; |
| /** Method to be used for the notification. */ |
| unative_t method; |
| /** Arguments that will be sent if the IRQ is claimed. */ |
| unative_t scratch[IPC_CALL_LEN]; |
| /** Top-half pseudocode. */ |
| irq_code_t *code; |
| /** Counter. */ |
| 139,7 → 144,7 |
| /** Trigger level of the IRQ. */ |
| irq_trigger_t trigger; |
| /** Claim ownership of the IRQ. */ |
| irq_ownership_t (* claim)(void *); |
| irq_ownership_t (* claim)(struct irq *); |
| /** Handler for this IRQ and device. */ |
| irq_handler_t handler; |
| /** Instance argument for the handler and the claim function. */ |
| 154,11 → 159,13 |
| ipc_notif_cfg_t notif_cfg; |
| } irq_t; |
| SPINLOCK_EXTERN(irq_uspace_hash_table_lock); |
| extern hash_table_t irq_uspace_hash_table; |
| extern void irq_init(count_t, count_t); |
| extern void irq_initialize(irq_t *); |
| extern void irq_register(irq_t *); |
| extern irq_t *irq_dispatch_and_lock(inr_t); |
| extern irq_t *irq_find_and_lock(inr_t, devno_t); |
| #endif |
| /branches/dynload/kernel/generic/include/console/console.h |
|---|
| 41,6 → 41,8 |
| extern chardev_t *stdin; |
| extern chardev_t *stdout; |
| extern bool silent; |
| extern void klog_init(void); |
| extern void klog_update(void); |
| /branches/dynload/kernel/generic/include/mm/frame.h |
|---|
| 38,34 → 38,82 |
| #include <arch/types.h> |
| #include <adt/list.h> |
| #include <mm/buddy.h> |
| #include <synch/spinlock.h> |
| #include <mm/buddy.h> |
| #include <arch/mm/page.h> |
| #include <arch/mm/frame.h> |
| #define ONE_FRAME 0 |
| #define TWO_FRAMES 1 |
| #define FOUR_FRAMES 2 |
| #define ONE_FRAME 0 |
| #define TWO_FRAMES 1 |
| #define FOUR_FRAMES 2 |
| #ifdef ARCH_STACK_FRAMES |
| #define STACK_FRAMES ARCH_STACK_FRAMES |
| #define STACK_FRAMES ARCH_STACK_FRAMES |
| #else |
| #define STACK_FRAMES ONE_FRAME |
| #define STACK_FRAMES ONE_FRAME |
| #endif |
| /** Maximum number of zones in system. */ |
| #define ZONES_MAX 16 |
| /** Maximum number of zones in the system. */ |
| #define ZONES_MAX 32 |
| /** Convert the frame address to kernel va. */ |
| #define FRAME_KA 0x1 |
| typedef uint8_t frame_flags_t; |
| /** Convert the frame address to kernel VA. */ |
| #define FRAME_KA 0x01 |
| /** Do not panic and do not sleep on failure. */ |
| #define FRAME_ATOMIC 0x2 |
| #define FRAME_ATOMIC 0x02 |
| /** Do not start reclaiming when no free memory. */ |
| #define FRAME_NO_RECLAIM 0x4 |
| /** Do not allocate above 4 GiB. */ |
| #define FRAME_LOW_4_GiB 0x8 |
| #define FRAME_NO_RECLAIM 0x04 |
| typedef uint8_t zone_flags_t; |
| /** Available zone (free for allocation) */ |
| #define ZONE_AVAILABLE 0x00 |
| /** Zone is reserved (not available for allocation) */ |
| #define ZONE_RESERVED 0x08 |
| /** Zone is used by firmware (not available for allocation) */ |
| #define ZONE_FIRMWARE 0x10 |
| /** Currently there is no equivalent zone flags |
| for frame flags */ |
| #define FRAME_TO_ZONE_FLAGS(frame_flags) 0 |
| typedef struct { |
| count_t refcount; /**< Tracking of shared frames */ |
| uint8_t buddy_order; /**< Buddy system block order */ |
| link_t buddy_link; /**< Link to the next free block inside |
| one order */ |
| void *parent; /**< If allocated by slab, this points there */ |
| } frame_t; |
| typedef struct { |
| pfn_t base; /**< Frame_no of the first frame |
| in the frames array */ |
| count_t count; /**< Size of zone */ |
| count_t free_count; /**< Number of free frame_t |
| structures */ |
| count_t busy_count; /**< Number of busy frame_t |
| structures */ |
| zone_flags_t flags; /**< Type of the zone */ |
| frame_t *frames; /**< Array of frame_t structures |
| in this zone */ |
| buddy_system_t *buddy_system; /**< Buddy system for the zone */ |
| } zone_t; |
| /* |
| * The zoneinfo.lock must be locked when accessing zoneinfo structure. |
| * Some of the attributes in zone_t structures are 'read-only' |
| */ |
| typedef struct { |
| SPINLOCK_DECLARE(lock); |
| count_t count; |
| zone_t info[ZONES_MAX]; |
| } zones_t; |
| extern zones_t zones; |
| static inline uintptr_t PFN2ADDR(pfn_t frame) |
| { |
| return (uintptr_t) (frame << FRAME_WIDTH); |
| 88,31 → 136,37 |
| return (size_t) (frames << FRAME_WIDTH); |
| } |
| #define IS_BUDDY_ORDER_OK(index, order) \ |
| static inline bool zone_flags_available(zone_flags_t flags) |
| { |
| return ((flags & (ZONE_RESERVED | ZONE_FIRMWARE)) == 0); |
| } |
| #define IS_BUDDY_ORDER_OK(index, order) \ |
| ((~(((unative_t) -1) << (order)) & (index)) == 0) |
| #define IS_BUDDY_LEFT_BLOCK(zone, frame) \ |
| (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) |
| #define IS_BUDDY_RIGHT_BLOCK(zone, frame) \ |
| (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1) |
| #define IS_BUDDY_LEFT_BLOCK_ABS(zone, frame) \ |
| (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) |
| #define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame) \ |
| (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1) |
| #define IS_BUDDY_LEFT_BLOCK(zone, frame) \ |
| (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 0) |
| #define IS_BUDDY_RIGHT_BLOCK(zone, frame) \ |
| (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 1) |
| #define IS_BUDDY_LEFT_BLOCK_ABS(zone, frame) \ |
| (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 0) |
| #define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame) \ |
| (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 1) |
| #define frame_alloc(order, flags) \ |
| #define frame_alloc(order, flags) \ |
| frame_alloc_generic(order, flags, NULL) |
| extern void frame_init(void); |
| extern void *frame_alloc_generic(uint8_t, int, unsigned int *); |
| extern void *frame_alloc_generic(uint8_t, frame_flags_t, count_t *); |
| extern void frame_free(uintptr_t); |
| extern void frame_reference_add(pfn_t); |
| extern int zone_create(pfn_t, count_t, pfn_t, int); |
| extern void *frame_get_parent(pfn_t, unsigned int); |
| extern void frame_set_parent(pfn_t, void *, unsigned int); |
| extern count_t find_zone(pfn_t frame, count_t count, count_t hint); |
| extern count_t zone_create(pfn_t, count_t, pfn_t, zone_flags_t); |
| extern void *frame_get_parent(pfn_t, count_t); |
| extern void frame_set_parent(pfn_t, void *, count_t); |
| extern void frame_mark_unavailable(pfn_t, count_t); |
| extern uintptr_t zone_conf_size(count_t); |
| extern void zone_merge(unsigned int, unsigned int); |
| extern bool zone_merge(count_t, count_t); |
| extern void zone_merge_all(void); |
| extern uint64_t zone_total_size(void); |
| 120,7 → 174,7 |
| * Console functions |
| */ |
| extern void zone_print_list(void); |
| extern void zone_print_one(unsigned int); |
| extern void zone_print_one(count_t); |
| #endif |
| /branches/dynload/kernel/generic/include/mm/page.h |
|---|
| 61,7 → 61,6 |
| extern void map_structure(uintptr_t s, size_t size); |
| extern uintptr_t hw_map(uintptr_t physaddr, size_t size); |
| extern void hw_area(uintptr_t *physaddr, pfn_t *frames); |
| #endif |
| /branches/dynload/kernel/generic/include/mm/slab.h |
|---|
| 59,7 → 59,7 |
| /* slab_reclaim constants */ |
| /** Reclaim all possible memory, because we are in memory stress */ |
| #define SLAB_RECLAIM_ALL 0x1 |
| #define SLAB_RECLAIM_ALL 0x01 |
| /* cache_create flags */ |
| /branches/dynload/kernel/generic/include/mm/buddy.h |
|---|
| 82,7 → 82,7 |
| extern link_t *buddy_system_alloc(buddy_system_t *, uint8_t); |
| extern bool buddy_system_can_alloc(buddy_system_t *, uint8_t); |
| extern void buddy_system_free(buddy_system_t *, link_t *); |
| extern size_t buddy_conf_size(int); |
| extern size_t buddy_conf_size(size_t); |
| extern link_t *buddy_system_alloc_block(buddy_system_t *, link_t *); |
| #endif |
| /branches/dynload/kernel/generic/include/syscall/syscall.h |
|---|
| 44,6 → 44,7 |
| SYS_THREAD_GET_ID, |
| SYS_TASK_GET_ID, |
| SYS_TASK_SET_NAME, |
| SYS_PROGRAM_SPAWN_LOADER, |
| SYS_FUTEX_SLEEP, |
| /branches/dynload/kernel/generic/include/ipc/irq.h |
|---|
| 36,7 → 36,7 |
| #define KERN_IPC_IRQ_H_ |
| /** Maximum length of IPC IRQ program */ |
| #define IRQ_MAX_PROG_SIZE 10 |
| #define IRQ_MAX_PROG_SIZE 20 |
| #include <ipc/ipc.h> |
| #include <ddi/irq.h> |
| 43,12 → 43,15 |
| #include <arch/types.h> |
| #include <adt/list.h> |
| extern int ipc_irq_register(answerbox_t *box, inr_t inr, devno_t devno, |
| unative_t method, irq_code_t *ucode); |
| extern void ipc_irq_send_notif(irq_t *irq); |
| extern void ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno); |
| extern void ipc_irq_cleanup(answerbox_t *box); |
| extern int ipc_irq_register(answerbox_t *, inr_t, devno_t, unative_t, |
| irq_code_t *); |
| extern irq_ownership_t ipc_irq_top_half_claim(irq_t *); |
| extern void ipc_irq_top_half_handler(irq_t *); |
| extern int ipc_irq_unregister(answerbox_t *, inr_t, devno_t); |
| extern void ipc_irq_cleanup(answerbox_t *); |
| /* |
| * User friendly wrappers for ipc_irq_send_msg(). They are in the form |
| * ipc_irq_send_msg_m(), where m is the number of payload arguments. |
| 66,8 → 69,8 |
| #define ipc_irq_send_msg_5(irq, a1, a2, a3, a4, a5) \ |
| ipc_irq_send_msg((irq), (a1), (a2), (a3), (a4), (a5)) |
| extern void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2, |
| unative_t a3, unative_t a4, unative_t a5); |
| extern void ipc_irq_send_msg(irq_t *, unative_t, unative_t, unative_t, unative_t, |
| unative_t); |
| #endif |