| Message ID | 1429122322-5728-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | Accepted |
| Commit | 8a741f952fe5fc698b9747ae32b11045e90c251f |
| Headers | show |
Merged, Maxim. On 04/15/15 21:25, Mike Holmes wrote: > The odph helper src files do not belong in linux-generic, move them out > to the helper directory. > From the helper directory they may be more cleanly extended to support > other execution environments beyond Linux. > Clean up checkpatch whitespace warning in the migrated code. > > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > --- > v2 move src files to root of helper > > platform/linux-generic/odp_linux.c => helper/linux.c | 1 - > platform/linux-generic/odp_ring.c => helper/ring.c | 0 > platform/linux-generic/Makefile.am | 4 ++-- > 3 files changed, 2 insertions(+), 3 deletions(-) > rename platform/linux-generic/odp_linux.c => helper/linux.c (99%) > rename platform/linux-generic/odp_ring.c => helper/ring.c (100%) > > diff --git a/platform/linux-generic/odp_linux.c b/helper/linux.c > similarity index 99% > rename from platform/linux-generic/odp_linux.c > rename to helper/linux.c > index 6865ab1..b753e4d 100644 > --- a/platform/linux-generic/odp_linux.c > +++ b/helper/linux.c > @@ -141,7 +141,6 @@ void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num) > pthread_attr_destroy(&thread_tbl[i].attr); > free(thread_tbl[i].start_args); > } > - > } > > > diff --git a/platform/linux-generic/odp_ring.c b/helper/ring.c > similarity index 100% > rename from platform/linux-generic/odp_ring.c > rename to helper/ring.c > diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am > index ea509c9..66f0474 100644 > --- a/platform/linux-generic/Makefile.am > +++ b/platform/linux-generic/Makefile.am > @@ -151,14 +151,14 @@ __LIB__libodp_la_SOURCES = \ > odp_event.c \ > odp_init.c \ > odp_impl.c \ > - odp_linux.c \ > + ../../helper/linux.c \ > odp_packet.c \ > odp_packet_flags.c \ > odp_packet_io.c \ > odp_packet_socket.c \ > odp_pool.c \ > odp_queue.c \ > - odp_ring.c \ > + ../../helper/ring.c \ > odp_rwlock.c \ > odp_schedule.c \ > odp_shared_memory.c \
diff --git a/platform/linux-generic/odp_linux.c b/helper/linux.c similarity index 99% rename from platform/linux-generic/odp_linux.c rename to helper/linux.c index 6865ab1..b753e4d 100644 --- a/platform/linux-generic/odp_linux.c +++ b/helper/linux.c @@ -141,7 +141,6 @@ void odph_linux_pthread_join(odph_linux_pthread_t *thread_tbl, int num) pthread_attr_destroy(&thread_tbl[i].attr); free(thread_tbl[i].start_args); } - } diff --git a/platform/linux-generic/odp_ring.c b/helper/ring.c similarity index 100% rename from platform/linux-generic/odp_ring.c rename to helper/ring.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ea509c9..66f0474 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -151,14 +151,14 @@ __LIB__libodp_la_SOURCES = \ odp_event.c \ odp_init.c \ odp_impl.c \ - odp_linux.c \ + ../../helper/linux.c \ odp_packet.c \ odp_packet_flags.c \ odp_packet_io.c \ odp_packet_socket.c \ odp_pool.c \ odp_queue.c \ - odp_ring.c \ + ../../helper/ring.c \ odp_rwlock.c \ odp_schedule.c \ odp_shared_memory.c \
The odph helper src files do not belong in linux-generic, move them out to the helper directory. From the helper directory they may be more cleanly extended to support other execution environments beyond Linux. Clean up checkpatch whitespace warning in the migrated code. Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- v2 move src files to root of helper platform/linux-generic/odp_linux.c => helper/linux.c | 1 - platform/linux-generic/odp_ring.c => helper/ring.c | 0 platform/linux-generic/Makefile.am | 4 ++-- 3 files changed, 2 insertions(+), 3 deletions(-) rename platform/linux-generic/odp_linux.c => helper/linux.c (99%) rename platform/linux-generic/odp_ring.c => helper/ring.c (100%)