Codebase list libatasmart / c7c4961
Merge commit 'upstream/0.16' Conflicts: atasmart.c Michael Biebl 14 years ago
4 changed file(s) with 45 addition(s) and 27 deletion(s). Raw diff Collapse all Expand all
+16
-7
atasmart.c less more
24732473 goto finish;
24742474 }
24752475
2476 if ((vid == 0x152d && (pid == 0x2329 || pid == 0x2338 || pid == 0x2339))) {
2476 if ((vid == 0x152d && pid == 0x2329) ||
2477 (vid == 0x152d && pid == 0x2338) ||
2478 (vid == 0x152d && pid == 0x2339))
24772479 /* Some JMicron bridges seem to choke on SMART
24782480 * commands, so let's explicitly black list
24792481 * them here.
24802482 *
2481 * https://bugzilla.redhat.com/show_bug.cgi?id=515881 */
2483 * https://bugzilla.redhat.com/show_bug.cgi?id=515881
2484 *
2485 * At least some of the JMicron bridges with
2486 * these vids/pids choke on the jmicron access
2487 * mode. To make sure we don't break things
2488 * for people we now disable this by
2489 * default.*/
24822490 d->type = SK_DISK_TYPE_NONE;
2483 } else if ((vid == 0x0c0b && pid == 0xb159) ||
2491 else if ((vid == 0x152d && pid == 0x2336))
2492 /* This JMicron bridge seems to always work
2493 * with SMART commands send with the jmicron
2494 * access mode. */
2495 d->type = SK_DISK_TYPE_JMICRON;
2496 else if ((vid == 0x0c0b && pid == 0xb159) ||
24842497 (vid == 0x04fc && pid == 0x0c25) ||
24852498 (vid == 0x04fc && pid == 0x0c15))
24862499 d->type = SK_DISK_TYPE_SUNPLUS;
2487 else if ((vid == 0x152d && pid == 0x2336) ||
2488 (vid == 0x152d && pid == 0x2338) ||
2489 (vid == 0x152d && pid == 0x2339))
2490 d->type = SK_DISK_TYPE_JMICRON;
24912500 else
24922501 d->type = SK_DISK_TYPE_ATA_PASSTHROUGH_12;
24932502
+16
-7
atasmart.strpool.c less more
25992599 goto finish;
26002600 }
26012601
2602 if ((vid == 0x152d && pid == 0x2329)) {
2602 if ((vid == 0x152d && pid == 0x2329) ||
2603 (vid == 0x152d && pid == 0x2338) ||
2604 (vid == 0x152d && pid == 0x2339))
26032605 /* Some JMicron bridges seem to choke on SMART
26042606 * commands, so let's explicitly black list
26052607 * them here.
26062608 *
2607 * https://bugzilla.redhat.com/show_bug.cgi?id=515881 */
2609 * https://bugzilla.redhat.com/show_bug.cgi?id=515881
2610 *
2611 * At least some of the JMicron bridges with
2612 * these vids/pids choke on the jmicron access
2613 * mode. To make sure we don't break things
2614 * for people we now disable this by
2615 * default.*/
26082616 d->type = SK_DISK_TYPE_NONE;
2609 } else if ((vid == 0x0c0b && pid == 0xb159) ||
2617 else if ((vid == 0x152d && pid == 0x2336))
2618 /* This JMicron bridge seems to always work
2619 * with SMART commands send with the jmicron
2620 * access mode. */
2621 d->type = SK_DISK_TYPE_JMICRON;
2622 else if ((vid == 0x0c0b && pid == 0xb159) ||
26102623 (vid == 0x04fc && pid == 0x0c25) ||
26112624 (vid == 0x04fc && pid == 0x0c15))
26122625 d->type = SK_DISK_TYPE_SUNPLUS;
2613 else if ((vid == 0x152d && pid == 0x2336) ||
2614 (vid == 0x152d && pid == 0x2338) ||
2615 (vid == 0x152d && pid == 0x2339))
2616 d->type = SK_DISK_TYPE_JMICRON;
26172626 else
26182627 d->type = SK_DISK_TYPE_ATA_PASSTHROUGH_12;
26192628
+11
-11
configure less more
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.63 for libatasmart 0.15.
2 # Generated by GNU Autoconf 2.63 for libatasmart 0.16.
33 #
44 # Report bugs to <mzyvongnfzneg (at) 0pointer (dot) net>.
55 #
744744 # Identity of this package.
745745 PACKAGE_NAME='libatasmart'
746746 PACKAGE_TARNAME='libatasmart'
747 PACKAGE_VERSION='0.15'
748 PACKAGE_STRING='libatasmart 0.15'
747 PACKAGE_VERSION='0.16'
748 PACKAGE_STRING='libatasmart 0.16'
749749 PACKAGE_BUGREPORT='mzyvongnfzneg (at) 0pointer (dot) net'
750750
751751 ac_unique_file="atasmart.c"
14881488 # Omit some internal or obsolete options to make the list less imposing.
14891489 # This message is too long to be a string in the A/UX 3.1 sh.
14901490 cat <<_ACEOF
1491 \`configure' configures libatasmart 0.15 to adapt to many kinds of systems.
1491 \`configure' configures libatasmart 0.16 to adapt to many kinds of systems.
14921492
14931493 Usage: $0 [OPTION]... [VAR=VALUE]...
14941494
15581558
15591559 if test -n "$ac_init_help"; then
15601560 case $ac_init_help in
1561 short | recursive ) echo "Configuration of libatasmart 0.15:";;
1561 short | recursive ) echo "Configuration of libatasmart 0.16:";;
15621562 esac
15631563 cat <<\_ACEOF
15641564
16681668 test -n "$ac_init_help" && exit $ac_status
16691669 if $ac_init_version; then
16701670 cat <<\_ACEOF
1671 libatasmart configure 0.15
1671 libatasmart configure 0.16
16721672 generated by GNU Autoconf 2.63
16731673
16741674 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
16821682 This file contains any messages produced by compilers while
16831683 running configure, to aid debugging if configure makes a mistake.
16841684
1685 It was created by libatasmart $as_me 0.15, which was
1685 It was created by libatasmart $as_me 0.16, which was
16861686 generated by GNU Autoconf 2.63. Invocation command line was
16871687
16881688 $ $0 $@
25482548
25492549 # Define the identity of the package.
25502550 PACKAGE='libatasmart'
2551 VERSION='0.15'
2551 VERSION='0.16'
25522552
25532553
25542554 cat >>confdefs.h <<_ACEOF
26732673 PACKAGE_URL=http://git.0pointer.de/?p=libatasmart.git
26742674
26752675
2676 LIBATASMART_VERSION_INFO=4:1:0
2676 LIBATASMART_VERSION_INFO=4:2:0
26772677
26782678
26792679 # Make sure we can run config.sub.
1856218562 # report actual input values of CONFIG_FILES etc. instead of their
1856318563 # values after options handling.
1856418564 ac_log="
18565 This file was extended by libatasmart $as_me 0.15, which was
18565 This file was extended by libatasmart $as_me 0.16, which was
1856618566 generated by GNU Autoconf 2.63. Invocation command line was
1856718567
1856818568 CONFIG_FILES = $CONFIG_FILES
1862518625 _ACEOF
1862618626 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1862718627 ac_cs_version="\\
18628 libatasmart config.status 0.15
18628 libatasmart config.status 0.16
1862918629 configured by $0, generated by GNU Autoconf 2.63,
1863018630 with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1863118631
+2
-2
configure.ac less more
2020
2121 AC_PREREQ(2.63)
2222
23 AC_INIT([libatasmart], 0.15, [mzyvongnfzneg (at) 0pointer (dot) net])
23 AC_INIT([libatasmart], 0.16, [mzyvongnfzneg (at) 0pointer (dot) net])
2424 AC_CONFIG_SRCDIR([atasmart.c])
2525 AC_CONFIG_HEADERS([config.h])
2626 AC_CONFIG_MACRO_DIR(m4)
2929
3030 AC_SUBST(PACKAGE_URL, [http://git.0pointer.de/?p=libatasmart.git])
3131
32 AC_SUBST(LIBATASMART_VERSION_INFO, [4:1:0])
32 AC_SUBST(LIBATASMART_VERSION_INFO, [4:2:0])
3333
3434 AC_CANONICAL_HOST
3535