changeset 1862:d27de7fdbf21

* include/hal_io.h: Add cyg_hal_sys_shmget(), cyg_hal_sys_shmat() and cyg_hal_sys_shmdt() system calls * src/synth_syscalls.c: Implementations of cyg_hal_sys_shmget(), cyg_hal_sys_shmat() and cyg_hal_sys_shmdt(). Moved cyg_hal_sys_mmap() from the flash driver to here.
author asl
date Wed, 15 Dec 2004 14:01:38 +0000
parents 4a42c095c4fa
children 359e586bd44f
files packages/hal/synth/arch/current/ChangeLog packages/hal/synth/arch/current/cdl/hal_synth.cdl packages/hal/synth/arch/current/include/hal_io.h packages/hal/synth/arch/current/src/synth_syscalls.c
diffstat 4 files changed, 143 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/synth/arch/current/ChangeLog
+++ b/packages/hal/synth/arch/current/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-14  Alexander Neundorf <neundorf@kde.org>
+	    Andrew Lunn        <andrew.lunn@ascom.ch>
+
+	* include/hal_io.h: Add cyg_hal_sys_shmget(), cyg_hal_sys_shmat()
+	and cyg_hal_sys_shmdt() system calls
+	* src/synth_syscalls.c: Implementations of cyg_hal_sys_shmget(), 
+	cyg_hal_sys_shmat() and cyg_hal_sys_shmdt(). Moved 
+	cyg_hal_sys_mmap() from the flash driver to here.
+
 2004-08-09  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* include/hal_intr.h (HAL_PLATFORM_RESET): Added missing ;
--- a/packages/hal/synth/arch/current/cdl/hal_synth.cdl
+++ b/packages/hal/synth/arch/current/cdl/hal_synth.cdl
@@ -71,7 +71,7 @@ cdl_package CYGPKG_HAL_SYNTH {
         @echo >> $(notdir $@).deps
         @rm target.tmp
     }
-    compile       synth_entry.c synth_diag.c synth_intr.c
+    compile       synth_entry.c synth_diag.c synth_intr.c synth_syscalls.c
 
     define_proc {
         puts $::cdl_system_header "#define CYGBLD_HAL_TARGET_H   <pkgconf/hal_synth.h>"
--- a/packages/hal/synth/arch/current/include/hal_io.h
+++ b/packages/hal/synth/arch/current/include/hal_io.h
@@ -477,6 +477,33 @@ externC int             cyg_hal_sys_pipe
 externC int             cyg_hal_sys_close(int);
 externC int             cyg_hal_sys_dup2(int, int);
  
+#define CYG_HAL_SYS_IPCOP_semop          1
+#define CYG_HAL_SYS_IPCOP_semget         2
+#define CYG_HAL_SYS_IPCOP_semctl         3
+#define CYG_HAL_SYS_IPCOP_msgsnd        11
+#define CYG_HAL_SYS_IPCOP_msgrcv        12
+#define CYG_HAL_SYS_IPCOP_msgget        13
+#define CYG_HAL_SYS_IPCOP_msgctl        14
+#define CYG_HAL_SYS_IPCOP_shmat         21
+#define CYG_HAL_SYS_IPCOP_shmdt         22
+#define CYG_HAL_SYS_IPCOP_shmget        23
+#define CYG_HAL_SYS_IPCOP_shmctl        24
+
+/*The ipc system call, which is used by the following shmem
+  functions. These may be unportable*/
+
+// Generic system call. Depending on the value of call, it will
+// perform the following functions.
+externC int             cyg_hal_sys_ipc(int call, int first, int second, 
+                                        int third, void* ptr);
+//get an identifier for a shared memory segment
+externC int             cyg_hal_sys_shmget (int key, int size, int shmflg);
+//attach to an shared memory segment
+externC void *          cyg_hal_sys_shmat (int shmid, const void* shmaddr, 
+                                           int shmflg);
+//detach from it again
+externC int             cyg_hal_sys_shmdt (const void* shmaddr);
+
 // The actual implementation appears to return the new brk() value.
 externC void*           cyg_hal_sys_brk(void*);
 
@@ -484,8 +511,18 @@ externC void*           cyg_hal_sys_brk(
 // not a char*. 
 externC int             cyg_hal_sys_getcwd(char*, int);
 
-// mmap on the "host" system - this may be unportable.
-externC int             cyg_hal_sys_mmap(struct cyg_hal_sys_mmap_args *);
+// mmap on the "host" system - this may be unportable. This is the
+// really system call into the kernel which passes one structure
+// containing all the arguments.
+externC int             cyg_hal_sys_mmapx(struct cyg_hal_sys_mmap_args *);
+
+// This is the mmap call that users are used to.
+externC int             cyg_hal_sys_mmap(void *addr, 
+                                         unsigned long length, 
+                                         unsigned long prot, 
+                                         unsigned long flags, 
+                                         unsigned long fd, 
+                                         unsigned long off);
 
 externC int cyg_hal_sys_readdir(unsigned int fd, 
                                 struct cyg_hal_sys_dirent *dp, 
new file mode 100644
--- /dev/null
+++ b/packages/hal/synth/arch/current/src/synth_syscalls.c
@@ -0,0 +1,94 @@
+//=============================================================================
+//
+//      synth_syscalls.c
+//
+//      Synthetic target access to more complex system calls
+//
+//=============================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 2004 Andrew Lunn
+// Copyright (C) 2004 eCosCentric Ltd
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//=============================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s):   Andrew Lunn
+// Contributors:Alexander Neundorf
+// Date:        2004-12-15
+// Purpose:     Access to more complex system calls which require marshalling.
+// Description: 
+//
+//####DESCRIPTIONEND####
+//
+//=============================================================================
+
+#include <cyg/infra/cyg_type.h>
+#include <cyg/hal/hal_diag.h>
+#include <cyg/hal/hal_io.h>
+
+void * cyg_hal_sys_shmat(int shmid, const void* shmaddr, int shmflg)
+{
+   void * result;
+   void * raddr;
+   
+   result = (void *) cyg_hal_sys_ipc(CYG_HAL_SYS_IPCOP_shmat, 
+                                     shmid, 
+                                     shmflg, 
+                                     (int) (&raddr), 
+                                     (void*)shmaddr);
+   return raddr;
+}
+
+int cyg_hal_sys_shmget(int key, int size, int shmflg)
+{
+  return cyg_hal_sys_ipc(CYG_HAL_SYS_IPCOP_shmget, key, size, shmflg, NULL);
+}
+
+int cyg_hal_sys_shmdt(const void* shmaddr)
+{
+  return cyg_hal_sys_ipc(CYG_HAL_SYS_IPCOP_shmdt, 0, 0, 0, 
+                         ((void *) shmaddr));
+}
+
+int 
+cyg_hal_sys_mmap(void *addr, unsigned long length, unsigned long prot, 
+                    unsigned long flags, unsigned long fd, unsigned long off)
+{
+  
+  struct cyg_hal_sys_mmap_args args;
+  
+  args.addr = (unsigned long) addr;
+  args.len = length;
+  args.prot = prot = prot;
+  args.flags = flags;
+  args.fd = fd;
+  args.offset = off;
+  
+  return (cyg_hal_sys_mmapx(&args));
+}