From 140d3143360f724e2628e3927aa012db3e007980 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Mon, 25 May 2015 13:18:47 -0400 Subject: [PATCH] Eliminate references to k_memset() and k_memcpy() Since the kernel now provides a minimal string library, there is no longer any reason not to use the standard memset() and memcpy() APIs. Change-Id: Iad587ace6f41fd94c9c961d13d9322495a7da1be Signed-off-by: Allan Stephens --- drivers/pci/pci_interface.c | 2 +- kernel/microkernel/global.c | 5 +++-- kernel/microkernel/k_mbox.c | 8 ++++---- kernel/microkernel/k_pipe_buffer.c | 2 +- kernel/microkernel/k_pipe_util.c | 2 +- kernel/microkernel/k_queue.c | 8 ++++---- kernel/microkernel/k_task.c | 3 ++- kernel/microkernel/movedata.c | 4 ++-- kernel/nanokernel/nano_fiber.c | 3 ++- samples/microkernel/test/test_fp_sharing/src/main.c | 3 ++- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/drivers/pci/pci_interface.c b/drivers/pci/pci_interface.c index a69d72d1f25..3641bbd59f0 100644 --- a/drivers/pci/pci_interface.c +++ b/drivers/pci/pci_interface.c @@ -399,7 +399,7 @@ void pci_header_get(uint32_t controller, /* clear out the header */ - k_memset((char *)pci_dev_header, sizeof(union pci_dev), 0); + memset((char *)pci_dev_header, sizeof(union pci_dev), 0); /* fill in the PCI header from the device */ diff --git a/kernel/microkernel/global.c b/kernel/microkernel/global.c index 26030859e7f..3e82d2de2fc 100644 --- a/kernel/microkernel/global.c +++ b/kernel/microkernel/global.c @@ -33,6 +33,7 @@ #include "minik.h" #include "nanokernel.h" #include "nanok.h" +#include #include #include @@ -76,8 +77,8 @@ void kernel_init(void) init_node(); #ifdef CONFIG_INIT_STACKS - k_memset((char *)_k_server_command_stack_storage, 0xaa, - sizeof(_k_server_command_stack_storage)); + memset((char *)_k_server_command_stack_storage, 0xaa, + sizeof(_k_server_command_stack_storage)); #endif nano_stack_init(&_k_command_stack, _k_server_command_stack_storage); diff --git a/kernel/microkernel/k_mbox.c b/kernel/microkernel/k_mbox.c index 9da0a1eedfe..8528827fa20 100644 --- a/kernel/microkernel/k_mbox.c +++ b/kernel/microkernel/k_mbox.c @@ -67,7 +67,7 @@ static void copy_packet(struct k_args **out, struct k_args *in) * a backpointer to the original packet. */ - k_memcpy(*out, in, sizeof(struct k_args)); + memcpy(*out, in, sizeof(struct k_args)); (*out)->Ctxt.args = in; } @@ -245,7 +245,7 @@ void _k_mbox_send_ack(struct k_args *pCopyWriter) struct k_args A; #ifndef NO_KARG_CLEAR - k_memset(&A, 0xfd, sizeof(struct k_args)); + memset(&A, 0xfd, sizeof(struct k_args)); #endif A.Comm = SIGNALS; A.Args.s1.sema = pCopyWriter->Args.m1.mess.extra.sema; @@ -785,7 +785,7 @@ void _k_mbox_receive_data(struct k_args *Starter) set_state_bit(_k_current_task, TF_RECVDATA); GETARGS(CopyStarter); - k_memcpy(CopyStarter, Starter, sizeof(struct k_args)); + memcpy(CopyStarter, Starter, sizeof(struct k_args)); CopyStarter->Ctxt.args = Starter; MoveD = CopyStarter->Args.m1.mess.extra.transfer; @@ -962,7 +962,7 @@ void _k_mbox_send_data(struct k_args *Starter) set_state_bit(_k_current_task, TF_SENDDATA); GETARGS(CopyStarter); - k_memcpy(CopyStarter, Starter, sizeof(struct k_args)); + memcpy(CopyStarter, Starter, sizeof(struct k_args)); CopyStarter->Ctxt.args = Starter; MoveD = CopyStarter->Args.m1.mess.extra.transfer; diff --git a/kernel/microkernel/k_pipe_buffer.c b/kernel/microkernel/k_pipe_buffer.c index 71e942360a7..2a80c478c81 100644 --- a/kernel/microkernel/k_pipe_buffer.c +++ b/kernel/microkernel/k_pipe_buffer.c @@ -203,7 +203,7 @@ static void MarkersClear(struct marker_list *pMarkerList) int i; for (i = 0; i < MAXNBR_MARKERS; i++, pM++) { - k_memset(pM, 0, sizeof(struct marker)); + memset(pM, 0, sizeof(struct marker)); pM->Next = -1; pM->Prev = -1; } diff --git a/kernel/microkernel/k_pipe_util.c b/kernel/microkernel/k_pipe_util.c index f1e901aecc0..961a8aa2eac 100644 --- a/kernel/microkernel/k_pipe_util.c +++ b/kernel/microkernel/k_pipe_util.c @@ -60,7 +60,7 @@ void myfreetimer(struct k_timer * *ppTimer) void mycopypacket(struct k_args **out, struct k_args *in) { GETARGS(*out); - k_memcpy(*out, in, sizeof(struct k_args)); + memcpy(*out, in, sizeof(struct k_args)); (*out)->Ctxt.args = in; } diff --git a/kernel/microkernel/k_queue.c b/kernel/microkernel/k_queue.c index 9078cff1f52..db99bc5a2d3 100644 --- a/kernel/microkernel/k_queue.c +++ b/kernel/microkernel/k_queue.c @@ -84,7 +84,7 @@ void _k_fifo_enque_request(struct k_args *A) if (W) { Q->Waiters = W->Forw; p = W->Args.q1.data; - k_memcpy(p, q, w); + memcpy(p, q, w); #ifdef CONFIG_SYS_CLOCK_EXISTS if (W->Time.timer) { @@ -100,7 +100,7 @@ void _k_fifo_enque_request(struct k_args *A) #endif else { p = Q->Enqp; - k_memcpy(p, q, w); + memcpy(p, q, w); p = (char *)((int)p + w); if (p == Q->Endp) Q->Enqp = Q->Base; @@ -208,7 +208,7 @@ void _k_fifo_deque_request(struct k_args *A) n = Q->Nused; if (n) { q = Q->Deqp; - k_memcpy(p, q, w); + memcpy(p, q, w); q = (char *)((int)q + w); if (q == Q->Endp) Q->Deqp = Q->Base; @@ -222,7 +222,7 @@ void _k_fifo_deque_request(struct k_args *A) p = Q->Enqp; q = W->Args.q1.data; w = OCTET_TO_SIZEOFUNIT(Q->Esize); - k_memcpy(p, q, w); + memcpy(p, q, w); p = (char *)((int)p + w); if (p == Q->Endp) Q->Enqp = Q->Base; diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index b88af5927b3..09a0402862e 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -209,7 +210,7 @@ void start_task(struct k_proc *X, /* ptr to task control block */ /* Note: the field X->worksize now represents the task size in bytes */ #ifdef CONFIG_INIT_STACKS - k_memset(X->workspace, 0xaa, X->worksize); + memset(X->workspace, 0xaa, X->worksize); #endif contextOptions = 0; diff --git a/kernel/microkernel/movedata.c b/kernel/microkernel/movedata.c index a036eb838db..a0af9e071fb 100644 --- a/kernel/microkernel/movedata.c +++ b/kernel/microkernel/movedata.c @@ -65,8 +65,8 @@ static void mvdreq_docont(struct k_args *Cont) static void mvdreq_copy(struct moved_req *ReqArgs) { - k_memcpy(ReqArgs->destination, ReqArgs->source, - OCTET_TO_SIZEOFUNIT(ReqArgs->iTotalSize)); + memcpy(ReqArgs->destination, ReqArgs->source, + OCTET_TO_SIZEOFUNIT(ReqArgs->iTotalSize)); if (ReqArgs->Action & MVDACT_SNDACK) mvdreq_docont(ReqArgs->Extra.Setup.ContSnd); diff --git a/kernel/nanokernel/nano_fiber.c b/kernel/nanokernel/nano_fiber.c index 3a2f2a8433e..acbaadee35c 100644 --- a/kernel/nanokernel/nano_fiber.c +++ b/kernel/nanokernel/nano_fiber.c @@ -37,6 +37,7 @@ either in the form of an actual function or an alias to a function. */ #include +#include #include #include @@ -79,7 +80,7 @@ void _fiber_start(char *pStack, unsigned int imask; #ifdef CONFIG_INIT_STACKS - k_memset((char *)pStack, 0xaa, stackSize); + memset((char *)pStack, 0xaa, stackSize); #endif ccs = _NewContext((char *)pStack, diff --git a/samples/microkernel/test/test_fp_sharing/src/main.c b/samples/microkernel/test/test_fp_sharing/src/main.c index a27dd4603ec..959dccd04c7 100644 --- a/samples/microkernel/test/test_fp_sharing/src/main.c +++ b/samples/microkernel/test/test_fp_sharing/src/main.c @@ -91,6 +91,7 @@ x87 FPU registers are being saved/restored. #include #include "float_context.h" #include +#include #ifndef MAX_TESTS /* test duration, unless overridden by project builder (0 => run forever) */ @@ -220,7 +221,7 @@ void load_store_low(void) * floating point values that have been saved. */ - k_memset(&floatRegSetStore, 0, SIZEOF_FP_REG_SET); + memset(&floatRegSetStore, 0, SIZEOF_FP_REG_SET); /* * Utilize an architecture specific function to load all the floating