Changeset 152 for sbliveos2/trunk/lib32

Timestamp:

Jul 17, 2000, 8:37:33 PM (25 years ago)

Author:

sandervl

Message:

misc updates

Location:

sbliveos2/trunk/lib32

Files:

• memory.cpp (modified) (7 diffs)
• sound.c (modified) (1 diff)

sbliveos2/trunk/lib32/memory.cpp

@@ -129 +129 @@
 void __copy_user(void *to, const void *from, unsigned long n)
 {
+        if(to == NULL || from == NULL) {
+                DebugInt3();
+                return;
+        }
+        if(n == 0) return;
 #ifdef KEE
         memcpy(to, from, n);
@@ -139 +144 @@
 unsigned long copy_to_user(void *to, const void *from, unsigned long n)
 {
+        if(to == NULL || from == NULL) {
+                DebugInt3();
+                return 0;
+        }
+        if(n == 0) return 0;
 #ifdef KEE
         memcpy(to, from, n);
@@ -150 +160 @@
 void __copy_user_zeroing(void *to, const void *from, unsigned long n)
 {
+        if(to == NULL || from == NULL) {
+                DebugInt3();
+                return;
+        }
+        if(n == 0) return;
         copy_to_user(to, from, n);
 }
@@ -156 +171 @@
 unsigned long copy_from_user(void *to, const void *from, unsigned long n)
 {
+        if(to == NULL || from == NULL) {
+                DebugInt3();
+                return 0;
+        }
+        if(n == 0) return 0;
 #ifdef KEE
         memcpy(to, from, n);
@@ -167 +187 @@
 int get_user(int size, void *dest, void *src)
 {
+        if(size == 0)   return 0;
+
+        if(dest == NULL || src == NULL) {
+                DebugInt3();
+                return 0;
+        }
 #ifdef KEE
         memcpy(dest, src, size);
@@ -178 +204 @@
 int put_user(int x, void *ptr)
 {
+        if(ptr == NULL) {
+                DebugInt3();
+                return 0;
+        }
+
         *(int *)ptr = x;
         return 0;
@@ -200 +231 @@
  char near *addr;
 
+  if(size == 0) {
+        DebugInt3();
+        return NULL;
+  }
   if(size > 1024) {
 #ifdef KEE

sbliveos2/trunk/lib32/sound.c

@@ -451 +451 @@
 //******************************************************************************
 //******************************************************************************
+ULONG OSS32_StreamGetSpace(ULONG streamtype, ULONG streamid)
+{
+ struct inode   ossinode;
+ struct file    ossfile;
+ struct dentry  ossdentry;
+ ULONG          ossid = streamtype & OSS_IDMASK;
+ audio_buf_info info;
+ char NEAR     *tmpbuf;
+ ULONG          cmd;
+ int            transferred;
+
+  ossinode.i_rdev = ossid;
+  ossfile.private_data = (void *)streamid;
+  ossfile.f_flags = 0;
+  ossfile.f_dentry = &ossdentry;
+  ossdentry.d_inode = &ossinode;
+
+  switch(streamtype) {
+  case OSS_STREAM_WAVEOUT:
+        ossfile.f_mode = FMODE_WRITE;
+        cmd = SNDCTL_DSP_GETOSPACE;
+        break;
+  case OSS_STREAM_WAVEIN:
+        ossfile.f_mode = FMODE_READ;
+        cmd = SNDCTL_DSP_GETISPACE;
+        break;
+  case OSS_STREAM_MIDIOUT:
+        ossfile.f_mode = FMODE_WRITE;
+        break;
+  case OSS_STREAM_MIDIIN:
+        ossfile.f_mode = FMODE_READ;
+        break;
+  }
+
+  if(!oss_devices[ossid].write || !oss_devices[ossid].read || !oss_devices[ossid].ioctl) {
+        return 0;
+  }
+  //check how much room is left in the circular dma buffer
+#ifdef KEE
+  tmpbuf = (char NEAR *)&info;
+#else
+  tmpbuf = (char NEAR *)__StackToFlat((ULONG)&info);
+#endif
+  if(oss_devices[ossid].ioctl(&ossinode, &ossfile, cmd, (ULONG)tmpbuf)) {
+        return 0;
+  }
+  return info.bytes;
+}
+//******************************************************************************
+//******************************************************************************
 ULONG OSS32_SetVolume(ULONG streamtype, ULONG streamid, ULONG cmd, ULONG volume)
 {