enable done

Author: HawxChen

assignment02/part2/hc_sr04.h

@@ -92,6 +92,7 @@ static ssize_t echo_show(struct device *dev,
  printk(KERN_ALERT "echo_show@ Done: %s", hcsr->pplat_dev->plf_dev.name);
  return ret;
 }
+
 static ssize_t echo_store(struct device *dev,
  struct device_attribute *attr,
  const char *buf,
@@ -124,6 +125,14 @@ static ssize_t echo_store(struct device *dev,
  goto FAILED_SET;
  }
 
+ spin_lock(&(hcsr->irq_done_lock));
+ hcsr->irq_done = IRQ_DONE;
+ spin_unlock(&(hcsr->irq_done_lock));
+
+ spin_lock(&(hcsr->irq_done_lock));
+ hcsr->irq_done = IRQ_DONE;
+ spin_unlock(&(hcsr->irq_done_lock));
+
  goto SUCCESS_SET;
 
 
@@ -166,6 +175,8 @@ static ssize_t mode_store(struct device *dev,
  printk(KERN_ALERT "mode_store@ %s\n", hcsr->pplat_dev->plf_dev.name);
 
  ret = sscanf(buf,"%d", &mode);
+ if(ONE_SHOT != mode && PERIODIC != mode) return -EINVAL;
+
  if(0 >= ret) {
  printk(KERN_ALERT "sscanf error: %d, mode:%d", ret, mode);
  goto FAILED_SETMODE;
@@ -214,6 +225,8 @@ static ssize_t frequency_store(struct device *dev,
  printk(KERN_ALERT "sscanf error: %d, freq:%d", ret, freq);
  goto FAILED_SETMODE;
  }
+ if(0 == freq) return -EINVAL;
+
  goto SUCCESS_SETMODE;
 
 FAILED_SETMODE:
@@ -256,11 +269,50 @@ static ssize_t enable_store(struct device *dev,
 
  printk(KERN_ALERT "enable_store@ %s\n", hcsr->pplat_dev->plf_dev.name);
 
+
  ret = sscanf(buf,"%d", &enable);
  if(0 >= ret) {
  printk(KERN_ALERT "sscanf error: %d, mode:%d", ret, enable);
  goto FAILED_SETMODE;
  }
+ if(0 == enable) {
+ //stop kthread
+ spin_lock(&(hcsr->kthread_lock));
+ if(NULL != hcsr->kthread) {
+ kthread_stop(hcsr->kthread);
+ hcsr->kthread = NULL;
+ }
+ spin_unlock(&(hcsr->kthread_lock));
+
+ spin_lock(&(hcsr->ongoing_lock));
+ hcsr->ongoing = STOPPING;
+ spin_unlock(&(hcsr->ongoing_lock));
+ } else if (1 == enable) {
+ if(NULL != hcsr->kthread) return count;
+
+ spin_lock(&(hcsr->kconfig.kconfig_lock));
+ if(ONE_SHOT == hcsr->kconfig.set.working_mode.mode) {
+ spin_unlock(&(hcsr->kconfig.kconfig_lock));
+ do {
+ spin_lock(&(hcsr->ongoing_lock));
+ if(STOPPING == hcsr->ongoing) {
+ spin_unlock(&(hcsr->ongoing_lock));
+ send(hcsr, 5);
+ break;
+ } 
+ spin_unlock(&(hcsr->ongoing_lock));
+ }
+ while(0);
+ } else{
+ spin_lock(&(hcsr->kthread_lock));
+ hcsr->kthread = kthread_run(thread_function, hcsr, hcsr->hc_sr04->name);
+ spin_unlock(&(hcsr->kthread_lock));
+ }
+ //kthread , freq some issues
+ //if ONE_SHOT
+ } else {
+ return -EINVAL;
+ }
  goto SUCCESS_SETMODE;
 
 FAILED_SETMODE:
@@ -422,9 +474,14 @@ void hc_sr04_exit(struct HCSR_device* pplat_dev) {
  hcsr_struct *pdev = (hcsr_struct *)(pplat_dev->pdev);
  printk(KERN_ALERT "hc_sr04: GoodBye Kernel World!!!: %s\n", pdev->hc_sr04->name);
 
+ if(NULL != pdev->kthread) 
+ kthread_stop(pdev->kthread);
+
  spin_lock(&(pdev->irq_done_lock));
  if(IRQ_DONE == pdev->irq_done) {
  free_irq(pdev->echo_isr_number, pdev);
+ printk(KERN_ALERT "hc_sr04: Free IRQ");
+
  }
  free_gpio(pdev); 
  spin_unlock(&(pdev->irq_done_lock));

assignment02/part2/hc_sr04_common.h

@@ -3,6 +3,7 @@
 #define __DEUBG__
 #include<linux/ioctl.h>
 #define ONE_SHOT (0)
+#define PERIODIC (1)
 #define NUM_DATA (5) 
 #define HCSR_W_MAGIC ('H')
 #define SETPINS _IOW (HCSR_W_MAGIC, 1, struct pin_set*)

assignment02/part2/hc_sr04_kernel.h

@@ -417,6 +417,7 @@ static long ioctl_SETMODE(struct file* file, unsigned long addr) {
  ret = -EAGAIN;
  goto ERR_SETMODE_RETURN;
  }
+ if(ONE_SHOT != working_mode.mode && PERIODIC != working_mode.mode) return -EINVAL;
 
 
  hcsr = (struct hcsr_struct*) file->private_data;
@@ -426,6 +427,7 @@ static long ioctl_SETMODE(struct file* file, unsigned long addr) {
  /*For Periodic Task*/
  hcsr->kconfig.set.working_mode = working_mode;
  printk(KERN_ALERT "%s: mode:%d, freq:%d\n", hcsr->hc_sr04->name, hcsr->kconfig.set.working_mode.mode, hcsr->kconfig.set.working_mode.freq);
+ spin_lock(&(hcsr->kthread_lock));
  if(ONE_SHOT != hcsr->kconfig.set.working_mode.mode && NULL != hcsr->kthread) {
  printk(KERN_ALERT "Keep Thread Going with period change: %s\n", hcsr->hc_sr04->name);
  kthread_stop(hcsr->kthread);
@@ -435,6 +437,7 @@ static long ioctl_SETMODE(struct file* file, unsigned long addr) {
  kthread_stop(hcsr->kthread);
  hcsr->kthread = NULL;
  }
+ spin_unlock(&(hcsr->kthread_lock));
  spin_unlock(&(hcsr->kconfig.kconfig_lock));
  goto SUCCESS_SETMODE_RETURN;
 
@@ -572,6 +575,10 @@ static ssize_t hc_sr04_write(struct file *file, const char __user *buf, size_t c
  printk(KERN_ALERT "CALL ThreadStop");
  kthread_stop(hcsr->kthread);
  hcsr->kthread = NULL;
+
+ spin_lock(&(hcsr->ongoing_lock));
+ hcsr->ongoing = STOPPING;
+ spin_unlock(&(hcsr->ongoing_lock));
  } while(0);
  } else {
  do {

assignment02/part2/hw_setting.h

@@ -31,7 +31,6 @@ char* A_pin_str[2][5] = {
 char B_pins[2][5][2] = { 
  //Linux Level Pull Mux0 Mux1
 
-//old
 /*IO10*/ {{HCSR_B_TRIG_PIN, 0}, {26, DIR_OUT}, {-1,-1}, {74, 0}, {-1,-1}},
 /*IO 6*/ {{HCSR_B_ECHO_PIN, 0}, {20, DIR_IN}, { 21, PULL_DOWN}, {68, 0}, {-1, -1}},
 };